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 4d1e0a4b35..d46d493db5 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
@@ -21,7 +21,7 @@
         <Style BasedOn="{StaticResource MahApps.Styles.Slider.Win10}" TargetType="{x:Type Slider}" />
 
         <Style BasedOn="{StaticResource {x:Type Controls:MetroHeader}}" TargetType="{x:Type Controls:MetroHeader}">
-            <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 5" />
+            <Setter Property="Controls:HeaderedControlHelper.HeaderMargin" Value="0 0 0 5" />
             <Setter Property="FontSize" Value="15" />
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
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 502207aa8e..048682b057 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml
@@ -121,8 +121,8 @@
                 <ContentControl DataContext="{Binding ElementName=DefaultTabControl}" Template="{StaticResource TabControlConfigDataTemplate}" />
                 <TabControl x:Name="DefaultTabControl"
                             Height="200"
-                            Controls:ControlsHelper.HeaderFontFamily="Segoe Script"
-                            Controls:ControlsHelper.HeaderFontSize="18">
+                            Controls:HeaderedControlHelper.HeaderFontFamily="Segoe Script"
+                            Controls:HeaderedControlHelper.HeaderFontSize="18">
                     <TabItem Header="Item _1">
                         <TextBlock FontSize="30" Text="Content" />
                     </TabItem>
@@ -294,41 +294,41 @@
                        Style="{DynamicResource DescriptionHeaderStyle}" />
                 <ContentControl DataContext="{Binding ElementName=MetroTabControlClosable}" Template="{StaticResource MetroTabControlConfigDataTemplate}" />
                 <Controls:MetroTabControl x:Name="MetroTabControlClosable" TabItemClosingEvent="MetroTabControl_TabItemClosingEvent">
-                    <Controls:MetroTabItem Controls:ControlsHelper.HeaderFontSize="20"
+                    <Controls:MetroTabItem Controls: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:ControlsHelper.HeaderFontSize="22"
+                    <Controls:MetroTabItem Controls: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:ControlsHelper.HeaderFontSize="24"
+                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="24"
                                            CloseButtonEnabled="True"
                                            Header="have">
                         <TextBlock FontSize="30" Text="More more content" />
                     </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:ControlsHelper.HeaderFontSize="26"
+                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="26"
                                            CloseButtonEnabled="True"
                                            Header="different">
                         <TextBlock FontSize="30" Text="So much content!" />
                     </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:ControlsHelper.HeaderFontSize="28"
+                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="28"
                                            CloseButtonEnabled="True"
                                            Header="font">
                         <TextBlock FontSize="30" Text="Content!" />
                     </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:ControlsHelper.HeaderFontSize="30"
+                    <Controls:MetroTabItem Controls: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:ControlsHelper.HeaderFontSize="36"
+                    <Controls:MetroTabItem Controls: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." />
@@ -342,7 +342,7 @@
                 <Controls:MetroTabControl x:Name="MetroTabControl"
                                           Height="200"
                                           KeepVisualTreeInMemoryWhenChangingTabs="True">
-                    <Controls:MetroTabItem Controls:ControlsHelper.HeaderFontSize="18" Header="item _1">
+                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="18" Header="item _1">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock FontSize="30" Text="Load-Count: " />
                             <TextBlock FontSize="30"
@@ -350,21 +350,21 @@
                                        Text="0" />
                         </StackPanel>
                     </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:ControlsHelper.HeaderFontSize="18" Header="item _2 more">
+                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="18" Header="item _2 more">
                         <TextBlock FontSize="30" Text="More content" />
                     </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:ControlsHelper.HeaderFontSize="18" Header="item _3 header here">
+                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="18" Header="item _3 header here">
                         <TextBlock FontSize="30" Text="More more content" />
                     </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:ControlsHelper.HeaderFontSize="18" Header="item _4 ">
+                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="18" Header="item _4 ">
                         <TextBlock FontSize="30" Text="So much content!" />
                     </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:ControlsHelper.HeaderFontSize="18"
+                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="18"
                                            CloseButtonEnabled="True"
                                            Header="item _5">
                         <TextBlock FontSize="30" Text="Content!" />
                     </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:ControlsHelper.HeaderFontSize="18" Header="item _6">
+                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="18" Header="item _6">
                         <TextBlock FontSize="30" Text="This is not content (it is)" />
                     </Controls:MetroTabItem>
                 </Controls:MetroTabControl>
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 30c29f2a80..0368f9af09 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
@@ -121,7 +121,7 @@
 
             <GroupBox Grid.Column="0"
                       Padding="5"
-                      Controls:ControlsHelper.HeaderFontSize="30"
+                      Controls:HeaderedControlHelper.HeaderFontSize="30"
                       Header="artists">
                 <ListBox x:Name="artist"
                          ItemsSource="{x:Static models:SampleData.Artists}"
@@ -170,7 +170,7 @@
 
             <GroupBox Grid.Column="2"
                       Padding="5"
-                      Controls:ControlsHelper.HeaderFontSize="30"
+                      Controls:HeaderedControlHelper.HeaderFontSize="30"
                       Header="some tests">
                 <StackPanel MinWidth="100"
                             HorizontalAlignment="Center"
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 a76bc58c1d..25d1af6b42 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
@@ -95,7 +95,7 @@
             <Controls:Flyout x:Name="settingsFlyout"
                              Margin="200 30 0 0"
                              Controls:ControlsHelper.ContentCharacterCasing="Upper"
-                             Controls:ControlsHelper.HeaderFontFamily="Segoe Script"
+                             Controls:HeaderedControlHelper.HeaderFontFamily="Segoe Script"
                              AreAnimationsEnabled="True"
                              FocusedElement="{Binding ElementName=firstTB}"
                              Header="Settings"
diff --git a/src/MahApps.Metro/Controls/Helper/ControlsHelper.cs b/src/MahApps.Metro/Controls/Helper/ControlsHelper.cs
index 4b5b58358a..f4faf07787 100644
--- a/src/MahApps.Metro/Controls/Helper/ControlsHelper.cs
+++ b/src/MahApps.Metro/Controls/Helper/ControlsHelper.cs
@@ -2,7 +2,6 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.Windows.Documents;
 using System.Windows.Media;
 
 namespace MahApps.Metro.Controls
@@ -67,89 +66,7 @@ public static void SetContentCharacterCasing(UIElement element, CharacterCasing
             element.SetValue(ContentCharacterCasingProperty, value);
         }
 
-        public static readonly DependencyProperty HeaderFontFamilyProperty =
-            DependencyProperty.RegisterAttached("HeaderFontFamily", typeof(FontFamily), typeof(ControlsHelper), new FrameworkPropertyMetadata(SystemFonts.MessageFontFamily));
 
-        [Category(AppName.MahApps)]
-        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
-        [AttachedPropertyBrowsableForType(typeof(TabControl))]
-        [AttachedPropertyBrowsableForType(typeof(Flyout))]
-        public static FontFamily GetHeaderFontFamily(UIElement element)
-        {
-            return (FontFamily)element.GetValue(HeaderFontFamilyProperty);
-        }
-
-        public static void SetHeaderFontFamily(UIElement element, FontFamily value)
-        {
-            element.SetValue(HeaderFontFamilyProperty, value);
-        }
-
-        public static readonly DependencyProperty HeaderFontSizeProperty =
-            DependencyProperty.RegisterAttached("HeaderFontSize", typeof(double), typeof(ControlsHelper), new FrameworkPropertyMetadata(SystemFonts.MessageFontSize));
-
-        [Category(AppName.MahApps)]
-        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
-        [AttachedPropertyBrowsableForType(typeof(TabControl))]
-        [AttachedPropertyBrowsableForType(typeof(Flyout))]
-        public static double GetHeaderFontSize(UIElement element)
-        {
-            return (double)element.GetValue(HeaderFontSizeProperty);
-        }
-
-        public static void SetHeaderFontSize(UIElement element, double value)
-        {
-            element.SetValue(HeaderFontSizeProperty, value);
-        }
-
-        public static readonly DependencyProperty HeaderFontStretchProperty =
-            DependencyProperty.RegisterAttached("HeaderFontStretch", typeof(FontStretch), typeof(ControlsHelper), new FrameworkPropertyMetadata(TextElement.FontStretchProperty.DefaultMetadata.DefaultValue));
-
-        [Category(AppName.MahApps)]
-        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
-        [AttachedPropertyBrowsableForType(typeof(TabControl))]
-        [AttachedPropertyBrowsableForType(typeof(Flyout))]
-        public static FontStretch GetHeaderFontStretch(UIElement element)
-        {
-            return (FontStretch)element.GetValue(HeaderFontStretchProperty);
-        }
-
-        public static void SetHeaderFontStretch(UIElement element, FontStretch value)
-        {
-            element.SetValue(HeaderFontStretchProperty, value);
-        }
-
-        public static readonly DependencyProperty HeaderFontWeightProperty =
-            DependencyProperty.RegisterAttached("HeaderFontWeight", typeof(FontWeight), typeof(ControlsHelper), new FrameworkPropertyMetadata(SystemFonts.MessageFontWeight));
-
-        [Category(AppName.MahApps)]
-        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
-        [AttachedPropertyBrowsableForType(typeof(TabControl))]
-        [AttachedPropertyBrowsableForType(typeof(Flyout))]
-        public static FontWeight GetHeaderFontWeight(UIElement element)
-        {
-            return (FontWeight)element.GetValue(HeaderFontWeightProperty);
-        }
-
-        public static void SetHeaderFontWeight(UIElement element, FontWeight value)
-        {
-            element.SetValue(HeaderFontWeightProperty, value);
-        }
-
-        public static readonly DependencyProperty HeaderMarginProperty =
-            DependencyProperty.RegisterAttached("HeaderMargin", typeof(Thickness), typeof(ControlsHelper), new UIPropertyMetadata(new Thickness()));
-
-        [Category(AppName.MahApps)]
-        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
-        [AttachedPropertyBrowsableForType(typeof(Flyout))]
-        public static Thickness GetHeaderMargin(UIElement element)
-        {
-            return (Thickness)element.GetValue(HeaderMarginProperty);
-        }
-
-        public static void SetHeaderMargin(UIElement element, Thickness value)
-        {
-            element.SetValue(HeaderMarginProperty, value);
-        }
 
         public static readonly DependencyProperty FocusBorderBrushProperty
             = DependencyProperty.RegisterAttached("FocusBorderBrush",
diff --git a/src/MahApps.Metro/Controls/Helper/HeaderedControlHelper.cs b/src/MahApps.Metro/Controls/Helper/HeaderedControlHelper.cs
index 827432de0f..d4c650f111 100644
--- a/src/MahApps.Metro/Controls/Helper/HeaderedControlHelper.cs
+++ b/src/MahApps.Metro/Controls/Helper/HeaderedControlHelper.cs
@@ -1,16 +1,23 @@
-using System.Windows;
+using System.ComponentModel;
+using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Documents;
 using System.Windows.Media;
 
 namespace MahApps.Metro.Controls
 {
-    using System.ComponentModel;
-
     public static class HeaderedControlHelper
     {
-        public static readonly DependencyProperty HeaderForegroundProperty =
-            DependencyProperty.RegisterAttached("HeaderForeground", typeof(Brush), typeof(HeaderedControlHelper), new UIPropertyMetadata(Brushes.White));
+        public static readonly DependencyProperty HeaderForegroundProperty
+            = DependencyProperty.RegisterAttached(
+                "HeaderForeground",
+                typeof(Brush),
+                typeof(HeaderedControlHelper),
+                new UIPropertyMetadata(Brushes.White));
 
+        /// <summary>
+        /// Gets the value of the Foreground for the header.
+        /// </summary>
         [Category(AppName.MahApps)]
         [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
         public static Brush GetHeaderForeground(UIElement element)
@@ -18,14 +25,26 @@ public static Brush GetHeaderForeground(UIElement element)
             return (Brush)element.GetValue(HeaderForegroundProperty);
         }
 
+        /// <summary>
+        /// Sets the value of the Foreground for the header.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
         public static void SetHeaderForeground(UIElement element, Brush value)
         {
             element.SetValue(HeaderForegroundProperty, value);
         }
 
-        public static readonly DependencyProperty HeaderBackgroundProperty =
-            DependencyProperty.RegisterAttached("HeaderBackground", typeof(Brush), typeof(HeaderedControlHelper), new UIPropertyMetadata(Panel.BackgroundProperty.DefaultMetadata.DefaultValue));
+        public static readonly DependencyProperty HeaderBackgroundProperty
+            = DependencyProperty.RegisterAttached(
+                "HeaderBackground",
+                typeof(Brush),
+                typeof(HeaderedControlHelper),
+                new UIPropertyMetadata(Panel.BackgroundProperty.DefaultMetadata.DefaultValue));
 
+        /// <summary>
+        /// Gets the value of the Background for the header.
+        /// </summary>
         [Category(AppName.MahApps)]
         [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
         public static Brush GetHeaderBackground(UIElement element)
@@ -33,9 +52,167 @@ public static Brush GetHeaderBackground(UIElement element)
             return (Brush)element.GetValue(HeaderBackgroundProperty);
         }
 
+        /// <summary>
+        /// Sets the value of the Background for the header.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
         public static void SetHeaderBackground(UIElement element, Brush value)
         {
             element.SetValue(HeaderBackgroundProperty, value);
         }
+
+        public static readonly DependencyProperty HeaderFontFamilyProperty
+            = DependencyProperty.RegisterAttached(
+                "HeaderFontFamily",
+                typeof(FontFamily),
+                typeof(HeaderedControlHelper),
+                new FrameworkPropertyMetadata(SystemFonts.MessageFontFamily, FrameworkPropertyMetadataOptions.Inherits));
+
+        /// <summary>
+        /// Gets the value of the FontFamily for the header.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
+        [AttachedPropertyBrowsableForType(typeof(TabControl))]
+        [AttachedPropertyBrowsableForType(typeof(Flyout))]
+        public static FontFamily GetHeaderFontFamily(UIElement element)
+        {
+            return (FontFamily)element.GetValue(HeaderFontFamilyProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the FontFamily for the header.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
+        [AttachedPropertyBrowsableForType(typeof(TabControl))]
+        [AttachedPropertyBrowsableForType(typeof(Flyout))]
+        public static void SetHeaderFontFamily(UIElement element, FontFamily value)
+        {
+            element.SetValue(HeaderFontFamilyProperty, value);
+        }
+
+        public static readonly DependencyProperty HeaderFontSizeProperty
+            = DependencyProperty.RegisterAttached(
+                "HeaderFontSize",
+                typeof(double),
+                typeof(HeaderedControlHelper),
+                new FrameworkPropertyMetadata(SystemFonts.MessageFontSize, FrameworkPropertyMetadataOptions.Inherits));
+
+        /// <summary>
+        /// Gets the value of the FontSize for the header.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
+        [AttachedPropertyBrowsableForType(typeof(TabControl))]
+        [AttachedPropertyBrowsableForType(typeof(Flyout))]
+        public static double GetHeaderFontSize(UIElement element)
+        {
+            return (double)element.GetValue(HeaderFontSizeProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the FontSize for the header.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
+        [AttachedPropertyBrowsableForType(typeof(TabControl))]
+        [AttachedPropertyBrowsableForType(typeof(Flyout))]
+        public static void SetHeaderFontSize(UIElement element, double value)
+        {
+            element.SetValue(HeaderFontSizeProperty, value);
+        }
+
+        public static readonly DependencyProperty HeaderFontStretchProperty
+            = DependencyProperty.RegisterAttached(
+                "HeaderFontStretch",
+                typeof(FontStretch),
+                typeof(HeaderedControlHelper),
+                new FrameworkPropertyMetadata(TextElement.FontStretchProperty.DefaultMetadata.DefaultValue, FrameworkPropertyMetadataOptions.Inherits));
+
+        /// <summary>
+        /// Gets the value of the FontStretch for the header.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
+        [AttachedPropertyBrowsableForType(typeof(TabControl))]
+        [AttachedPropertyBrowsableForType(typeof(Flyout))]
+        public static FontStretch GetHeaderFontStretch(UIElement element)
+        {
+            return (FontStretch)element.GetValue(HeaderFontStretchProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the FontStretch for the header.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
+        [AttachedPropertyBrowsableForType(typeof(TabControl))]
+        [AttachedPropertyBrowsableForType(typeof(Flyout))]
+        public static void SetHeaderFontStretch(UIElement element, FontStretch value)
+        {
+            element.SetValue(HeaderFontStretchProperty, value);
+        }
+
+        public static readonly DependencyProperty HeaderFontWeightProperty
+            = DependencyProperty.RegisterAttached(
+                "HeaderFontWeight",
+                typeof(FontWeight),
+                typeof(HeaderedControlHelper),
+                new FrameworkPropertyMetadata(SystemFonts.MessageFontWeight, FrameworkPropertyMetadataOptions.Inherits));
+
+        /// <summary>
+        /// Gets the value of the FontWeight for the header.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
+        [AttachedPropertyBrowsableForType(typeof(TabControl))]
+        [AttachedPropertyBrowsableForType(typeof(Flyout))]
+        public static FontWeight GetHeaderFontWeight(UIElement element)
+        {
+            return (FontWeight)element.GetValue(HeaderFontWeightProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the FontWeight for the header.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
+        [AttachedPropertyBrowsableForType(typeof(TabControl))]
+        [AttachedPropertyBrowsableForType(typeof(Flyout))]
+        public static void SetHeaderFontWeight(UIElement element, FontWeight value)
+        {
+            element.SetValue(HeaderFontWeightProperty, value);
+        }
+
+        public static readonly DependencyProperty HeaderMarginProperty
+            = DependencyProperty.RegisterAttached(
+                "HeaderMargin",
+                typeof(Thickness),
+                typeof(HeaderedControlHelper),
+                new UIPropertyMetadata(new Thickness()));
+
+        /// <summary>
+        /// Gets or sets the outer margin for the header.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
+        [AttachedPropertyBrowsableForType(typeof(Flyout))]
+        public static Thickness GetHeaderMargin(UIElement element)
+        {
+            return (Thickness)element.GetValue(HeaderMarginProperty);
+        }
+
+        /// <summary>
+        /// Sets or sets the outer margin for the header.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
+        [AttachedPropertyBrowsableForType(typeof(Flyout))]
+        public static void SetHeaderMargin(UIElement element, Thickness value)
+        {
+            element.SetValue(HeaderMarginProperty, value);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml b/src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml
index 32bbe175b6..9d98522ac6 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml
@@ -5,7 +5,7 @@
     <Style x:Key="MahApps.Styles.GroupBox.Clean" TargetType="GroupBox">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
         <Setter Property="BorderThickness" Value="0.3" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="16" />
+        <Setter Property="Controls:HeaderedControlHelper.HeaderFontSize" Value="16" />
         <Setter Property="Controls:HeaderedControlHelper.HeaderForeground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="Template">
             <Setter.Value>
@@ -23,10 +23,10 @@
                                                        ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                                        ContentTemplate="{TemplateBinding HeaderTemplate}"
                                                        ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                       FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
-                                                       FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
+                                                       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="True"
                                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
diff --git a/src/MahApps.Metro/Styles/Controls.Expander.xaml b/src/MahApps.Metro/Styles/Controls.Expander.xaml
index f88c523032..82470edf3d 100644
--- a/src/MahApps.Metro/Styles/Controls.Expander.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Expander.xaml
@@ -328,12 +328,12 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
         <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.Black}" />
         <Setter Property="Padding" Value="4" />
@@ -361,10 +361,10 @@
                                               ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                               ContentTemplate="{TemplateBinding HeaderTemplate}"
                                               ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                              FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
-                                              FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
-                                              FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
-                                              FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
+                                              FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
+                                              FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
+                                              FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
+                                              FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
                                               IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                               Style="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ExpanderHelper.HeaderDownStyle)}"
                                               UseLayoutRounding="False">
diff --git a/src/MahApps.Metro/Styles/Controls.GroupBox.xaml b/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
index 47eb91ea11..e5a7fc3204 100644
--- a/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
@@ -12,8 +12,8 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
         <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.Black}" />
         <Setter Property="Padding" Value="4" />
@@ -41,10 +41,10 @@
                                                        ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                                        ContentTemplate="{TemplateBinding HeaderTemplate}"
                                                        ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                       FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
-                                                       FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
+                                                       FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
+                                                       FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
+                                                       FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
+                                                       FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
                                                        RecognizesAccessKey="True"
                                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                                        UseLayoutRounding="False">
diff --git a/src/MahApps.Metro/Styles/Controls.TabControl.xaml b/src/MahApps.Metro/Styles/Controls.TabControl.xaml
index 21913ea5a6..d61f35b66b 100644
--- a/src/MahApps.Metro/Styles/Controls.TabControl.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TabControl.xaml
@@ -9,7 +9,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{x:Null}" />
         <!--  special property for header font size  -->
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.TabItem}" />
+        <Setter Property="Controls:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.TabItem}" />
         <Setter Property="Controls:TabControlHelper.UnderlineBrush" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
         <Setter Property="Controls:TabControlHelper.UnderlineMouseOverBrush" Value="{DynamicResource MahApps.Brushes.GrayHover}" />
         <Setter Property="Controls:TabControlHelper.UnderlineMouseOverSelectedBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
@@ -104,10 +104,10 @@
         <Setter Property="Background" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=Background, Mode=OneWay, FallbackValue=Transparent}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontFamily" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:ControlsHelper.HeaderFontFamily), Mode=OneWay}" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:ControlsHelper.HeaderFontSize), Mode=OneWay}" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontStretch" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:ControlsHelper.HeaderFontStretch), Mode=OneWay}" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontWeight" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:ControlsHelper.HeaderFontWeight), Mode=OneWay}" />
+        <Setter Property="Controls:HeaderedControlHelper.HeaderFontFamily" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:HeaderedControlHelper.HeaderFontFamily), Mode=OneWay}" />
+        <Setter Property="Controls:HeaderedControlHelper.HeaderFontSize" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:HeaderedControlHelper.HeaderFontSize), Mode=OneWay}" />
+        <Setter Property="Controls:HeaderedControlHelper.HeaderFontStretch" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:HeaderedControlHelper.HeaderFontStretch), Mode=OneWay}" />
+        <Setter Property="Controls:HeaderedControlHelper.HeaderFontWeight" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:HeaderedControlHelper.HeaderFontWeight), Mode=OneWay}" />
         <Setter Property="Controls:TabControlHelper.UnderlineBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlineBrush), Mode=OneWay}" />
         <Setter Property="Controls:TabControlHelper.UnderlineMouseOverBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlineMouseOverBrush), Mode=OneWay}" />
         <Setter Property="Controls:TabControlHelper.UnderlineMouseOverSelectedBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlineMouseOverSelectedBrush), Mode=OneWay}" />
@@ -150,11 +150,11 @@
                                                        ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                                        ContentTemplate="{TemplateBinding HeaderTemplate}"
                                                        ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                       FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
+                                                       FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
+                                                       FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
+                                                       FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
                                                        FontStyle="{TemplateBinding FontStyle}"
-                                                       FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
+                                                       FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
                                                        Foreground="{TemplateBinding Foreground}"
                                                        RecognizesAccessKey="True"
                                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
diff --git a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
index cf3df596d0..11b9353fcc 100644
--- a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -140,7 +140,7 @@
            TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="ContentDirection" Value="RightToLeft" />
         <Setter Property="ContentPadding" Value="0 0 10 0" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.ToggleSwitch.Header.Win10}" />
+        <Setter Property="Controls:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.ToggleSwitch.Header.Win10}" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.ToggleSwitch.Win10}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.ToggleSwitch.Win10}" />
         <Setter Property="HeaderFontFamily" Value="{DynamicResource MahApps.Fonts.Family.ToggleSwitch.Header.Win10}" />
diff --git a/src/MahApps.Metro/Styles/VS/Expander.xaml b/src/MahApps.Metro/Styles/VS/Expander.xaml
index 8f2aaa1fcc..6ed1b238c2 100644
--- a/src/MahApps.Metro/Styles/VS/Expander.xaml
+++ b/src/MahApps.Metro/Styles/VS/Expander.xaml
@@ -328,12 +328,12 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ExpanderHeaderThemeFontSize}" />
         <Setter Property="Controls:ExpanderHelper.HeaderDownStyle" Value="{StaticResource MahApps.Styles.ToggleButton.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" />
@@ -355,10 +355,10 @@
                                           ContentTemplate="{TemplateBinding HeaderTemplate}"
                                           ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
                                           DockPanel.Dock="Top"
-                                          FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
-                                          FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
-                                          FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
-                                          FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
+                                          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}"
                                           IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
diff --git a/src/MahApps.Metro/Styles/VS/GroupBox.xaml b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
index e5af2cabc8..822dddc780 100644
--- a/src/MahApps.Metro/Styles/VS/GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
@@ -11,8 +11,8 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.GroupBox.HeaderThemeFont}" />
         <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" />
@@ -32,10 +32,10 @@
                                                        ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                                        ContentTemplate="{TemplateBinding HeaderTemplate}"
                                                        ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                       FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
-                                                       FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
+                                                       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="True"
                                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
diff --git a/src/MahApps.Metro/Styles/VS/TabControl.xaml b/src/MahApps.Metro/Styles/VS/TabControl.xaml
index 8aa7bcf777..4fde255b2f 100644
--- a/src/MahApps.Metro/Styles/VS/TabControl.xaml
+++ b/src/MahApps.Metro/Styles/VS/TabControl.xaml
@@ -165,11 +165,11 @@
                                                        ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                                        ContentTemplate="{TemplateBinding HeaderTemplate}"
                                                        ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                       FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
+                                                       FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
+                                                       FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
+                                                       FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
                                                        FontStyle="{TemplateBinding FontStyle}"
-                                                       FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
+                                                       FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
                                                        Foreground="{TemplateBinding Foreground}"
                                                        RecognizesAccessKey="True"
                                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
diff --git a/src/MahApps.Metro/Themes/Flyout.xaml b/src/MahApps.Metro/Themes/Flyout.xaml
index b4ffd1af4d..28e5ddac6d 100644
--- a/src/MahApps.Metro/Themes/Flyout.xaml
+++ b/src/MahApps.Metro/Themes/Flyout.xaml
@@ -76,17 +76,17 @@
             <AdornerDecorator>
                 <DockPanel FocusVisualStyle="{x:Null}" Focusable="False">
                     <Controls:MetroThumbContentControl x:Name="PART_Header"
-                                                       Padding="{TemplateBinding Controls:ControlsHelper.HeaderMargin}"
+                                                       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:ControlsHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
-                                                       FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
+                                                       FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
+                                                       FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
+                                                       FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
+                                                       FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
                                                        RecognizesAccessKey="True"
                                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     <ContentPresenter x:Name="PART_Content"
@@ -222,8 +222,8 @@
     <Style TargetType="{x:Type Controls:Flyout}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Flyout.Background}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Flyout.Header}" />
-        <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="10" />
+        <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.FlyoutHeader}" />
@@ -236,10 +236,10 @@
         <Setter Property="Visibility" Value="Hidden" />
         <Style.Triggers>
             <Trigger Property="Position" Value="Right">
-                <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="10 25 10 10" />
+                <Setter Property="Controls:HeaderedControlHelper.HeaderMargin" Value="10 25 10 10" />
             </Trigger>
             <Trigger Property="Position" Value="Left">
-                <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="10 25 10 10" />
+                <Setter Property="Controls:HeaderedControlHelper.HeaderMargin" Value="10 25 10 10" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Themes/MetroHeader.xaml b/src/MahApps.Metro/Themes/MetroHeader.xaml
index c02c4bbedb..e5d2a04422 100644
--- a/src/MahApps.Metro/Themes/MetroHeader.xaml
+++ b/src/MahApps.Metro/Themes/MetroHeader.xaml
@@ -3,10 +3,10 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="MahApps.Styles.MetroHeader" TargetType="{x:Type Controls:MetroHeader}">
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Default}" />
-        <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 2" />
         <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" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -20,16 +20,16 @@
                         </Grid.RowDefinitions>
                         <Grid Grid.Row="0" Background="{TemplateBinding Controls:HeaderedControlHelper.HeaderBackground}">
                             <Controls:ContentControlEx x:Name="PART_Header"
-                                                       Margin="{TemplateBinding Controls:ControlsHelper.HeaderMargin}"
+                                                       Margin="{TemplateBinding Controls:HeaderedControlHelper.HeaderMargin}"
                                                        Content="{TemplateBinding Header}"
                                                        ContentCharacterCasing="{TemplateBinding Controls:ControlsHelper.ContentCharacterCasing}"
                                                        ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                                        ContentTemplate="{TemplateBinding HeaderTemplate}"
                                                        ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                       FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
-                                                       FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
+                                                       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="True"
diff --git a/src/MahApps.Metro/Themes/MetroTabItem.xaml b/src/MahApps.Metro/Themes/MetroTabItem.xaml
index fee96b6a63..d8496bd0dc 100644
--- a/src/MahApps.Metro/Themes/MetroTabItem.xaml
+++ b/src/MahApps.Metro/Themes/MetroTabItem.xaml
@@ -48,17 +48,17 @@
                                                            ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                                            ContentTemplate="{TemplateBinding HeaderTemplate}"
                                                            ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                           FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
-                                                           FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
-                                                           FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
+                                                           FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
+                                                           FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
+                                                           FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
                                                            FontStyle="{TemplateBinding FontStyle}"
-                                                           FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
+                                                           FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
                                                            Foreground="{TemplateBinding Foreground}"
                                                            RecognizesAccessKey="True"
                                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                 <Button x:Name="PART_CloseButton"
                                         Grid.Column="1"
-                                        Width="{TemplateBinding Controls:ControlsHelper.HeaderFontSize, Converter={StaticResource MetroTabItemCloseButtonWidthConverter}}"
+                                        Width="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize, Converter={StaticResource MetroTabItemCloseButtonWidthConverter}}"
                                         Height="{Binding RelativeSource={RelativeSource Self}, Path=Width, Mode=OneWay}"
                                         Margin="{TemplateBinding CloseButtonMargin}"
                                         VerticalAlignment="Top"
diff --git a/src/MahApps.Metro/Themes/ToggleSwitch.xaml b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
index b6edcaea72..3c5530a3e6 100644
--- a/src/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -90,8 +90,8 @@
 
     <Style x:Key="MahApps.Styles.ToggleSwitch" TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="ContentPadding" Value="0 0 4 0" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.ToggleSwitch.Header}" />
-        <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 5" />
+        <Setter Property="Controls:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.ToggleSwitch.Header}" />
+        <Setter Property="Controls:HeaderedControlHelper.HeaderMargin" Value="0 0 0 5" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.ToggleSwitch}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.ToggleSwitch}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
@@ -121,14 +121,14 @@
                             <ContentControl x:Name="Header"
                                             Grid.Column="0"
                                             Grid.ColumnSpan="2"
-                                            Margin="{TemplateBinding Controls:ControlsHelper.HeaderMargin}"
+                                            Margin="{TemplateBinding Controls:HeaderedControlHelper.HeaderMargin}"
                                             Content="{TemplateBinding Header}"
                                             ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                             ContentTemplate="{TemplateBinding HeaderTemplate}"
                                             ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
                                             FontFamily="{TemplateBinding HeaderFontFamily}"
-                                            FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
-                                            FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
+                                            FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
+                                            FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
                                             IsTabStop="False" />
                             <ContentControl x:Name="Content"
                                             Grid.Row="1"
diff --git a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
index f40a6cb570..b5747784cd 100644
--- a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
@@ -8,8 +8,8 @@
     <ControlTemplate x:Key="MahApps.Templates.WindowButtonCommands" TargetType="{x:Type Controls:WindowButtonCommands}">
         <StackPanel Orientation="Horizontal">
             <Button x:Name="PART_Min"
-                    Focusable="False"
                     Command="{x:Static SystemCommands.MinimizeWindowCommand}"
+                    Focusable="False"
                     IsEnabled="{Binding IsMinButtonEnabled, RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}}"
                     ToolTip="{Binding Minimize, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
                 <Button.Visibility>
@@ -30,8 +30,8 @@
                       SnapsToDevicePixels="True" />
             </Button>
             <Button x:Name="PART_Max"
-                    Focusable="False"
                     Command="{x:Static SystemCommands.MaximizeWindowCommand}"
+                    Focusable="False"
                     IsEnabled="{Binding IsMaxRestoreButtonEnabled, RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}}"
                     ToolTip="{Binding Maximize, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
                 <Button.Visibility>
@@ -56,8 +56,8 @@
                       SnapsToDevicePixels="True" />
             </Button>
             <Button x:Name="PART_Close"
-                    Focusable="False"
                     Command="{x:Static SystemCommands.CloseWindowCommand}"
+                    Focusable="False"
                     IsEnabled="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}, Path=IsCloseButtonEnabled, Mode=OneWay}"
                     RenderOptions.EdgeMode="Aliased"
                     ToolTip="{Binding Close, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
@@ -120,8 +120,8 @@
         <StackPanel Orientation="Horizontal">
             <Button x:Name="PART_Min"
                     Width="46"
-                    Focusable="False"
                     Command="{x:Static SystemCommands.MinimizeWindowCommand}"
+                    Focusable="False"
                     IsEnabled="{Binding IsMinButtonEnabled, RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}}"
                     ToolTip="{Binding Minimize, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                     UseLayoutRounding="True">
@@ -150,8 +150,8 @@
             </Button>
             <Button x:Name="PART_Max"
                     Width="46"
-                    Focusable="False"
                     Command="{x:Static SystemCommands.MaximizeWindowCommand}"
+                    Focusable="False"
                     IsEnabled="{Binding IsMaxRestoreButtonEnabled, RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}}"
                     ToolTip="{Binding Maximize, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                     UseLayoutRounding="True">
@@ -182,8 +182,8 @@
             </Button>
             <Button x:Name="PART_Close"
                     Width="46"
-                    Focusable="False"
                     Command="{x:Static SystemCommands.CloseWindowCommand}"
+                    Focusable="False"
                     IsEnabled="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}, Path=IsCloseButtonEnabled, Mode=OneWay}"
                     ToolTip="{Binding Close, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                     UseLayoutRounding="True">