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 3d3c502caa..3479b88e89 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -273,78 +273,28 @@
             </StackPanel>
         </StackPanel>
 
-        <StackPanel Grid.Row="1"
-                    Grid.Column="0"
-                    HorizontalAlignment="Center">
-            <StackPanel.Resources>
-                <Style x:Key="CustomMetroToggleSwitch"
-                       BasedOn="{StaticResource MahApps.Styles.ToggleSwitch}"
-                       TargetType="{x:Type Controls:ToggleSwitch}">
-                    <Setter Property="OffLabel" Value="False" />
-                    <Setter Property="OffSwitchBrush" Value="Red" />
-                    <Setter Property="OnLabel" Value="True" />
-                    <Setter Property="OnSwitchBrush" Value="Green" />
-                </Style>
-                <Style x:Key="CustomMetroToggleSwitchButton"
-                       BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton}"
-                       TargetType="{x:Type Controls:ToggleSwitchButton}">
-                    <Setter Property="OffSwitchBrush" Value="DarkRed" />
-                    <Setter Property="OnSwitchBrush" Value="DarkGreen" />
-                </Style>
-            </StackPanel.Resources>
-            <Label Content="Toggle switch" Style="{DynamicResource DescriptionHeaderStyle}" />
-            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
-                                   Header="ToggleSwitch Header"
-                                   IsChecked="True"
-                                   ToggleSwitchButtonStyle="{StaticResource CustomMetroToggleSwitchButton}" />
-            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
-                                   IsChecked="True"
-                                   Style="{DynamicResource CustomMetroToggleSwitch}" />
-            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
-                                   IsChecked="True"
-                                   IsEnabled="False" />
-            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}" IsEnabled="False" />
-        </StackPanel>
+        <!--  Row 1  -->
 
         <StackPanel Grid.Row="1"
-                    Grid.Column="1"
+                    Grid.Column="0"
                     HorizontalAlignment="Center">
-            <StackPanel.Resources>
-                <BooleanToVisibilityConverter x:Key="btv" />
-            </StackPanel.Resources>
-            <Label Content="Enable / Visible" Style="{DynamicResource DescriptionHeaderStyle}" />
-            <Controls:ToggleSwitch x:Name="enabledSwitch"
-                                   Margin="{StaticResource ControlMargin}"
-                                   Header="Win10 Style"
-                                   IsChecked="True"
-                                   OffLabel="Disabled"
-                                   OnLabel="Enabled"
-                                   Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" />
-            <Controls:ToggleSwitch x:Name="visibleSwitch"
-                                   Margin="{StaticResource ControlMargin}"
-                                   Controls:ValidationHelper.CloseOnMouseLeftButtonDown="True"
-                                   Controls:ValidationHelper.ShowValidationErrorOnMouseOver="True"
-                                   IsChecked="{Binding IsToggleSwitchVisible, ValidatesOnDataErrors=True}"
-                                   OffLabel="Collapsed"
-                                   OnLabel="Visible"
-                                   Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" />
-            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
-                                   IsEnabled="{Binding ElementName=enabledSwitch, Path=IsChecked}"
-                                   Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}"
-                                   Visibility="{Binding ElementName=visibleSwitch, Path=IsChecked, Converter={StaticResource btv}}" />
+            <Label Content="ToggleSwitch" Style="{DynamicResource DescriptionHeaderStyle}" />
 
+            <Controls:ToggleSwitch x:Name="TestToggleSwitch" Margin="{StaticResource ControlMargin}" Header="Header" />
+            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}" IsEnabled="{Binding ElementName=TestToggleSwitch, Path=IsOn, Mode=OneWay}" />
             <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
-                                   IsChecked="True"
-                                   IsEnabled="False"
-                                   Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" />
+                                   IsOn="True"
+                                   OffContent="Disabled"
+                                   OnContent="Enabled" />
             <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
-                                   IsChecked="False"
                                    IsEnabled="False"
-                                   Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" />
+                                   IsOn="True"
+                                   OffContent="Disabled"
+                                   OnContent="Enabled" />
         </StackPanel>
 
         <StackPanel Grid.Row="1"
-                    Grid.Column="2"
+                    Grid.Column="1"
                     HorizontalAlignment="Center"
                     UseLayoutRounding="True">
             <StackPanel>
@@ -395,7 +345,7 @@
         </StackPanel>
 
         <StackPanel Grid.Row="1"
-                    Grid.Column="3"
+                    Grid.Column="2"
                     HorizontalAlignment="Center"
                     UseLayoutRounding="True">
             <StackPanel>
@@ -458,7 +408,7 @@
         </StackPanel>
 
         <StackPanel Grid.Row="1"
-                    Grid.Column="4"
+                    Grid.Column="3"
                     HorizontalAlignment="Stretch">
             <StackPanel.Resources>
                 <Style x:Key="CircleDropDownButton"
@@ -523,7 +473,11 @@
                     </Controls:DropDownButton.Icon>
                 </Controls:DropDownButton>
             </StackPanel>
+        </StackPanel>
 
+        <StackPanel Grid.Row="1"
+                    Grid.Column="4"
+                    HorizontalAlignment="Stretch">
             <Label Content="SplitButton" Style="{DynamicResource DescriptionHeaderStyle}" />
 
             <Controls:SplitButton Margin="5"
@@ -549,7 +503,6 @@
                     <iconPacks:PackIconModern Margin="6" Kind="Book" />
                 </Controls:SplitButton.Icon>
             </Controls:SplitButton>
-
         </StackPanel>
     </Grid>
 
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 a85e5aa3d0..918f775efa 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml
@@ -113,7 +113,7 @@
             <StackPanel Margin="0 0 0 10" Orientation="Vertical">
                 <Controls:ToggleSwitch Margin="0 10 0 5"
                                        Header="IsPaneOpen:"
-                                       IsChecked="{Binding ElementName=HamburgerMenuControl, Path=IsPaneOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                       IsOn="{Binding ElementName=HamburgerMenuControl, Path=IsPaneOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                 <Controls:MetroHeader Margin="0 10 0 5" Header="DisplayMode:">
                     <ComboBox MinWidth="150"
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 9b7c50df99..24d53a30ee 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuDefault.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuDefault.xaml
@@ -107,13 +107,13 @@
             <StackPanel Margin="0 0 0 10" Orientation="Vertical">
                 <Controls:ToggleSwitch Margin="0 10 0 5"
                                        Header="HamburgerMenuItem About:"
-                                       IsChecked="{Binding CanShowHamburgerAboutCommand, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                       OffLabel="Disabled"
-                                       OnLabel="Enabled" />
+                                       IsOn="{Binding CanShowHamburgerAboutCommand, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                       OffContent="Disabled"
+                                       OnContent="Enabled" />
 
                 <Controls:ToggleSwitch Margin="0 10 0 5"
                                        Header="IsPaneOpen:"
-                                       IsChecked="{Binding IsHamburgerMenuPaneOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                       IsOn="{Binding IsHamburgerMenuPaneOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                 <Controls:MetroHeader Margin="0 10 0 5" Header="PanePlacement:">
                     <ComboBox MinWidth="150"
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 d46d493db5..75e1a66e10 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
@@ -12,12 +12,6 @@
              mc:Ignorable="d">
 
     <UserControl.Resources>
-        <Style BasedOn="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" TargetType="{x:Type Controls:ToggleSwitch}">
-            <Setter Property="FontSize" Value="15" />
-            <Setter Property="Margin" Value="0" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-
         <Style BasedOn="{StaticResource MahApps.Styles.Slider.Win10}" TargetType="{x:Type Slider}" />
 
         <Style BasedOn="{StaticResource {x:Type Controls:MetroHeader}}" TargetType="{x:Type Controls:MetroHeader}">
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 78b71570b7..e346e22600 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
@@ -594,8 +594,7 @@
                     <CheckBox x:Name="ModifierKeysRequired"
                               Margin="{StaticResource ControlMargin}"
                               Content="Require modifier keys" />
-                    <TextBlock Margin="{StaticResource ControlMargin}"
-                               Text="Try SHIFT+D to demonstrate validation" />
+                    <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"
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 ade828ee37..5d275486ec 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
@@ -129,17 +129,16 @@
                                        Grid.Column="1"
                                        Margin="2"
                                        Header="Flyout closing"
-                                       IsChecked="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                       OffLabel="Disabled"
-                                       OnLabel="Allowed" />
+                                       IsOn="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                       OffContent="Disabled"
+                                       OnContent="Allowed" />
                 <controls:ToggleSwitch Grid.Row="3"
                                        Grid.Column="1"
                                        Margin="2"
                                        Header="Flyout closing"
-                                       IsChecked="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                       OffLabel="Disabled"
-                                       OnLabel="Allowed"
-                                       Style="{DynamicResource MahApps.Styles.ToggleSwitch.Win10}" />
+                                       IsOn="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                       OffContent="Disabled"
+                                       OnContent="Allowed" />
 
             </Grid>
 
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 35b1dd75c2..373b71d818 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
@@ -176,7 +176,7 @@
             <StackPanel Margin="0 0 0 10" Orientation="Vertical">
                 <Controls:ToggleSwitch Margin="0 10 0 5"
                                        Header="IsPaneOpen:"
-                                       IsChecked="{Binding ElementName=HamburgerMenuControl, Path=IsPaneOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                       IsOn="{Binding ElementName=HamburgerMenuControl, Path=IsPaneOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                 <Controls:MetroHeader Margin="0 10 0 5" Header="DisplayMode:">
                     <ComboBox MinWidth="150"
@@ -264,7 +264,7 @@
                                         <Controls:ToggleSwitch Margin="0 0 0 5" Header="Lorem ipsum dolor sit amet, consectetur adipiscing elit" />
                                         <Controls:ToggleSwitch Margin="0 0 0 5"
                                                                Header="Ut dictum arcu egestas aliquet elementum"
-                                                               IsChecked="True" />
+                                                               IsOn="True" />
                                         <Controls:ToggleSwitch Margin="0 0 0 5" Header="Pellentesque ultricies metus quis dui luctus, vel faucibus risus rhoncus" />
                                     </StackPanel>
                                 </UserControl>
diff --git a/src/MahApps.Metro/Controls/ToggleSwitch.cs b/src/MahApps.Metro/Controls/ToggleSwitch.cs
index ba31c90971..c98c9dbe0e 100644
--- a/src/MahApps.Metro/Controls/ToggleSwitch.cs
+++ b/src/MahApps.Metro/Controls/ToggleSwitch.cs
@@ -1,16 +1,11 @@
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
-// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
-// All other rights reserved.
-
-using System;
+using System;
 using System.ComponentModel;
-using System.Globalization;
 using System.Windows;
+using System.Windows.Automation.Peers;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.Windows.Data;
 using System.Windows.Input;
+using System.Windows.Markup;
 using System.Windows.Media;
 
 namespace MahApps.Metro.Controls
@@ -18,361 +13,657 @@ namespace MahApps.Metro.Controls
     /// <summary>
     /// A control that allows the user to toggle between two states: One represents true; The other represents false.
     /// </summary>
-    [TemplateVisualState(Name = NormalState, GroupName = CommonStates)]
-    [TemplateVisualState(Name = DisabledState, GroupName = CommonStates)]
-    [TemplatePart(Name = SwitchPart, Type = typeof(ToggleButton))]
-    public class ToggleSwitch : HeaderedContentControl
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("WpfAnalyzers.TemplatePart", "WPF0132:Use PART prefix.", Justification = "<Pending>")]
+    [ContentProperty(nameof(Content))]
+    [TemplatePart(Name = nameof(HeaderContentPresenter), Type = typeof(ContentPresenter))]
+    [TemplatePart(Name = nameof(ContentPresenter), Type = typeof(ContentPresenter))]
+    [TemplatePart(Name = nameof(OffContentPresenter), Type = typeof(ContentPresenter))]
+    [TemplatePart(Name = nameof(OnContentPresenter), Type = typeof(ContentPresenter))]
+    [TemplatePart(Name = nameof(SwitchKnobBounds), Type = typeof(FrameworkElement))]
+    [TemplatePart(Name = nameof(SwitchKnob), Type = typeof(FrameworkElement))]
+    [TemplatePart(Name = nameof(KnobTranslateTransform), Type = typeof(TranslateTransform))]
+    [TemplatePart(Name = nameof(SwitchThumb), Type = typeof(Thumb))]
+    [TemplateVisualState(GroupName = VisualStates.GroupCommon, Name = VisualStates.StateNormal)]
+    [TemplateVisualState(GroupName = VisualStates.GroupCommon, Name = VisualStates.StateMouseOver)]
+    [TemplateVisualState(GroupName = VisualStates.GroupCommon, Name = VisualStates.StatePressed)]
+    [TemplateVisualState(GroupName = VisualStates.GroupCommon, Name = VisualStates.StateDisabled)]
+    [TemplateVisualState(GroupName = ContentStatesGroup, Name = OffContentState)]
+    [TemplateVisualState(GroupName = ContentStatesGroup, Name = OnContentState)]
+    [TemplateVisualState(GroupName = ToggleStatesGroup, Name = DraggingState)]
+    [TemplateVisualState(GroupName = ToggleStatesGroup, Name = OffState)]
+    [TemplateVisualState(GroupName = ToggleStatesGroup, Name = OnState)]
+    public class ToggleSwitch : HeaderedContentControl, ICommandSource
     {
-        private const string CommonStates = "CommonStates";
-        private const string NormalState = "Normal";
-        private const string DisabledState = "Disabled";
-        private const string SwitchPart = "Switch";
+        private const string ContentStatesGroup = "ContentStates";
+        private const string OffContentState = "OffContent";
+        private const string OnContentState = "OnContent";
+        private const string ToggleStatesGroup = "ToggleStates";
+        private const string DraggingState = "Dragging";
+        private const string OffState = "Off";
+        private const string OnState = "On";
 
-        private ToggleButton _toggleButton;
+        private double onTranslation;
+        private double startTranslation;
+        private bool wasDragged;
 
-        public static readonly DependencyProperty HeaderFontFamilyProperty = DependencyProperty.Register("HeaderFontFamily", typeof(FontFamily), typeof(ToggleSwitch), new PropertyMetadata(SystemFonts.MessageFontFamily));
+        private ContentPresenter HeaderContentPresenter { get; set; }
 
-        public static readonly DependencyProperty OnLabelProperty = DependencyProperty.Register("OnLabel", typeof(string), typeof(ToggleSwitch), new PropertyMetadata("On"));
-        public static readonly DependencyProperty OffLabelProperty = DependencyProperty.Register("OffLabel", typeof(string), typeof(ToggleSwitch), new PropertyMetadata("Off"));
+        private ContentPresenter ContentPresenter { get; set; }
 
-        public static readonly DependencyProperty OnSwitchBrushProperty = DependencyProperty.Register("OnSwitchBrush", typeof(Brush), typeof(ToggleSwitch), null);
-        public static readonly DependencyProperty OffSwitchBrushProperty = DependencyProperty.Register("OffSwitchBrush", typeof(Brush), typeof(ToggleSwitch), null);
+        private ContentPresenter OffContentPresenter { get; set; }
 
-        public static readonly DependencyProperty ThumbIndicatorBrushProperty = DependencyProperty.Register("ThumbIndicatorBrush", typeof(Brush), typeof(ToggleSwitch), null);
-        public static readonly DependencyProperty ThumbIndicatorDisabledBrushProperty = DependencyProperty.Register("ThumbIndicatorDisabledBrush", typeof(Brush), typeof(ToggleSwitch), null);
-        public static readonly DependencyProperty ThumbIndicatorWidthProperty = DependencyProperty.Register("ThumbIndicatorWidth", typeof(double), typeof(ToggleSwitch), new PropertyMetadata(13d));
+        private ContentPresenter OnContentPresenter { get; set; }
 
-        public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register("IsChecked", typeof(bool?), typeof(ToggleSwitch), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal, OnIsCheckedChanged));
+        private FrameworkElement SwitchKnobBounds { get; set; }
 
-        public static readonly DependencyProperty CheckChangedCommandProperty = DependencyProperty.Register("CheckChangedCommand", typeof(ICommand), typeof(ToggleSwitch), new PropertyMetadata(null));
-        public static readonly DependencyProperty CheckedCommandProperty = DependencyProperty.Register("CheckedCommand", typeof(ICommand), typeof(ToggleSwitch), new PropertyMetadata(null));
-        public static readonly DependencyProperty UnCheckedCommandProperty = DependencyProperty.Register("UnCheckedCommand", typeof(ICommand), typeof(ToggleSwitch), new PropertyMetadata(null));
+        private FrameworkElement SwitchKnob { get; set; }
 
-        public static readonly DependencyProperty CheckChangedCommandParameterProperty = DependencyProperty.Register("CheckChangedCommandParameter", typeof(object), typeof(ToggleSwitch), new PropertyMetadata(null));
-        public static readonly DependencyProperty CheckedCommandParameterProperty = DependencyProperty.Register("CheckedCommandParameter", typeof(object), typeof(ToggleSwitch), new PropertyMetadata(null));
-        public static readonly DependencyProperty UnCheckedCommandParameterProperty = DependencyProperty.Register("UnCheckedCommandParameter", typeof(object), typeof(ToggleSwitch), new PropertyMetadata(null));
+        private TranslateTransform KnobTranslateTransform { get; set; }
 
-        // LeftToRight means content left and button right and RightToLeft vise versa
-        public static readonly DependencyProperty ContentDirectionProperty = DependencyProperty.Register("ContentDirection", typeof(FlowDirection), typeof(ToggleSwitch), new PropertyMetadata(FlowDirection.LeftToRight));
-        /// <summary>
-        /// Identifies the <see cref="P:MahApps.Metro.Controls.ToggleSwitch.ContentPadding" /> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ContentPaddingProperty = DependencyProperty.Register(nameof(ContentPadding), typeof(Thickness), typeof(ToggleSwitch), new FrameworkPropertyMetadata(new Thickness(), FrameworkPropertyMetadataOptions.AffectsParentMeasure));
-        public static readonly DependencyProperty ToggleSwitchButtonStyleProperty = DependencyProperty.Register("ToggleSwitchButtonStyle", typeof(Style), typeof(ToggleSwitch), new FrameworkPropertyMetadata(default(Style), FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
+        private Thumb SwitchThumb { get; set; }
 
-        public event EventHandler<RoutedEventArgs> Checked;
-        public event EventHandler<RoutedEventArgs> Unchecked;
-        public event EventHandler<RoutedEventArgs> Indeterminate;
-        public event EventHandler<RoutedEventArgs> Click;
+        /// <summary>Identifies the <see cref="ContentDirection"/> dependency property.</summary>
+        public static readonly DependencyProperty ContentDirectionProperty
+            = DependencyProperty.Register(nameof(ContentDirection),
+                                          typeof(FlowDirection),
+                                          typeof(ToggleSwitch),
+                                          new PropertyMetadata(FlowDirection.LeftToRight));
 
         /// <summary>
-        /// Gets/sets the font family of the header.
-        /// </summary> 
-        [Bindable(true), Localizability(LocalizationCategory.Font)]
-        public FontFamily HeaderFontFamily
+        /// Gets or sets the flow direction of the switch and content.
+        /// </summary>
+        /// <remarks>
+        /// LeftToRight means content left and button right and RightToLeft vise versa.
+        /// </remarks>
+        [Bindable(true)]
+        [Category(AppName.MahApps)]
+        public FlowDirection ContentDirection
         {
-            get { return (FontFamily)GetValue(HeaderFontFamilyProperty); }
-            set { SetValue(HeaderFontFamilyProperty, value); }
+            get => (FlowDirection)this.GetValue(ContentDirectionProperty);
+            set => this.SetValue(ContentDirectionProperty, value);
         }
 
+        /// <summary>Identifies the <see cref="ContentPadding"/> dependency property.</summary>
+        public static readonly DependencyProperty ContentPaddingProperty
+            = DependencyProperty.Register(nameof(ContentPadding),
+                                          typeof(Thickness),
+                                          typeof(ToggleSwitch),
+                                          new FrameworkPropertyMetadata(new Thickness(), FrameworkPropertyMetadataOptions.AffectsParentMeasure));
+
         /// <summary>
-        /// Gets/sets the text to display when the control is in it's On state.
+        /// Gets or sets the padding of the inner content.
         /// </summary>
-        public string OnLabel
+        [Bindable(true)]
+        [Category(AppName.MahApps)]
+        public Thickness ContentPadding
         {
-            get { return (string)GetValue(OnLabelProperty); }
-            set { SetValue(OnLabelProperty, value); }
+            get => (Thickness)this.GetValue(ContentPaddingProperty);
+            set => this.SetValue(ContentPaddingProperty, value);
         }
 
-        /// <summary>
-        /// Gets/sets the text to display when the control is in it's Off state.
-        /// </summary>
-        public string OffLabel
+        /// <summary>Identifies the <see cref="IsOn"/> dependency property.</summary>
+        public static readonly DependencyProperty IsOnProperty
+            = DependencyProperty.Register(nameof(IsOn),
+                                          typeof(bool),
+                                          typeof(ToggleSwitch),
+                                          new FrameworkPropertyMetadata(
+                                              false,
+                                              FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
+                                              OnIsOnChanged));
+
+        private static void OnIsOnChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            get { return (string)GetValue(OffLabelProperty); }
-            set { SetValue(OffLabelProperty, value); }
+            if (e.NewValue != e.OldValue)
+            {
+                var toggleSwitch = (ToggleSwitch)d;
+                toggleSwitch.OnToggled();
+                toggleSwitch.UpdateVisualStates(true);
+            }
         }
 
         /// <summary>
-        /// Gets/sets the brush used for the on-switch's foreground.
+        /// Gets or sets a value that declares whether the state of the ToggleSwitch is "On".
         /// </summary>
-        public Brush OnSwitchBrush
+        [Category(AppName.MahApps)]
+        public bool IsOn
         {
-            get { return (Brush)GetValue(OnSwitchBrushProperty); }
-            set { SetValue(OnSwitchBrushProperty, value); }
+            get => (bool)this.GetValue(IsOnProperty);
+            set => this.SetValue(IsOnProperty, value);
         }
 
-        /// <summary>
-        /// Gets/sets the brush used for the off-switch's foreground.
-        /// </summary>
-        public Brush OffSwitchBrush
+        /// <summary>Identifies the <see cref="OnContent"/> dependency property.</summary>
+        public static readonly DependencyProperty OnContentProperty
+            = DependencyProperty.Register(nameof(OnContent),
+                                          typeof(object),
+                                          typeof(ToggleSwitch),
+                                          new FrameworkPropertyMetadata("On", OnOnContentChanged));
+
+        private static void OnOnContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            get { return (Brush)GetValue(OffSwitchBrushProperty); }
-            set { SetValue(OffSwitchBrushProperty, value); }
+            ((ToggleSwitch)d).OnOnContentChanged(e.OldValue, e.NewValue);
         }
 
-        /// <summary>
-        /// Gets/sets the brush used for the thumb indicator.
-        /// </summary>
-        public Brush ThumbIndicatorBrush
+        protected virtual void OnOnContentChanged(object oldContent, object newContent)
         {
-            get { return (Brush)GetValue(ThumbIndicatorBrushProperty); }
-            set { SetValue(ThumbIndicatorBrushProperty, value); }
         }
 
         /// <summary>
-        /// Gets/sets the brush used for the thumb indicator.
+        /// Provides the object content that should be displayed using the OnContentTemplate when this ToggleSwitch has state of "On".
         /// </summary>
-        public Brush ThumbIndicatorDisabledBrush
+        [Category(AppName.MahApps)]
+        public object OnContent
         {
-            get { return (Brush)GetValue(ThumbIndicatorDisabledBrushProperty); }
-            set { SetValue(ThumbIndicatorDisabledBrushProperty, value); }
+            get => this.GetValue(OnContentProperty);
+            set => this.SetValue(OnContentProperty, value);
         }
 
+        /// <summary>Identifies the <see cref="OnContentTemplate"/> dependency property.</summary>
+        public static readonly DependencyProperty OnContentTemplateProperty
+            = DependencyProperty.Register(nameof(OnContentTemplate),
+                                          typeof(DataTemplate),
+                                          typeof(ToggleSwitch));
+
         /// <summary>
-        /// Gets/sets the width of the thumb indicator.
+        /// Gets or sets the DataTemplate used to display the control's content while in "On" state.
         /// </summary>
-        public double ThumbIndicatorWidth
+        public DataTemplate OnContentTemplate
         {
-            get { return (double)GetValue(ThumbIndicatorWidthProperty); }
-            set { SetValue(ThumbIndicatorWidthProperty, value); }
+            get => (DataTemplate)this.GetValue(OnContentTemplateProperty);
+            set => this.SetValue(OnContentTemplateProperty, value);
         }
 
+        /// <summary>Identifies the <see cref="OnContentTemplateSelector"/> dependency property.</summary>
+        public static readonly DependencyProperty OnContentTemplateSelectorProperty
+            = DependencyProperty.Register(nameof(OnContentTemplateSelector),
+                                          typeof(DataTemplateSelector),
+                                          typeof(ToggleSwitch),
+                                          new FrameworkPropertyMetadata((DataTemplateSelector)null));
+
         /// <summary>
-        /// Gets/sets the control's content flow direction.
+        /// Gets or sets a template selector for OnContent property that enables an application writer to provide custom template-selection logic .
         /// </summary>
-        public FlowDirection ContentDirection
+        /// <remarks> 
+        /// This property is ignored if <seealso cref="OnContentTemplate"/> is set.
+        /// </remarks>
+        [Bindable(true)]
+        [Category(AppName.MahApps)]
+        public DataTemplateSelector OnContentTemplateSelector
         {
-            get { return (FlowDirection)GetValue(ContentDirectionProperty); }
-            set { SetValue(ContentDirectionProperty, value); }
+            get => (DataTemplateSelector)this.GetValue(OnContentTemplateSelectorProperty);
+            set => this.SetValue(OnContentTemplateSelectorProperty, value);
         }
 
+        /// <summary>Identifies the <see cref="OnContentStringFormat"/> dependency property.</summary>
+        public static readonly DependencyProperty OnContentStringFormatProperty
+            = DependencyProperty.Register(nameof(OnContentStringFormat),
+                                          typeof(string),
+                                          typeof(ToggleSwitch),
+                                          new FrameworkPropertyMetadata((string)null));
+
         /// <summary>
-        /// Gets or sets the padding of the inner content.
+        /// Gets or sets a composite string that specifies how to format the OnContent property if it is displayed as a string.
         /// </summary>
+        /// <remarks> 
+        /// This property is ignored if <seealso cref="OnContentTemplate"/> is set.
+        /// </remarks>
         [Bindable(true)]
         [Category(AppName.MahApps)]
-        public Thickness ContentPadding
+        public string OnContentStringFormat
         {
-            get { return (Thickness)this.GetValue(ContentPaddingProperty); }
-            set { this.SetValue(ContentPaddingProperty, value); }
+            get => (string)this.GetValue(OnContentStringFormatProperty);
+            set => this.SetValue(OnContentStringFormatProperty, value);
         }
 
-        /// <summary>
-        /// Gets/sets the control's toggle switch button style.
-        /// </summary>
-        public Style ToggleSwitchButtonStyle
+        /// <summary>Identifies the <see cref="OffContent"/> dependency property.</summary>
+        public static readonly DependencyProperty OffContentProperty
+            = DependencyProperty.Register(nameof(OffContent),
+                                          typeof(object),
+                                          typeof(ToggleSwitch),
+                                          new FrameworkPropertyMetadata("Off", OnOffContentChanged));
+
+        private static void OnOffContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((ToggleSwitch)d).OnOffContentChanged(e.OldValue, e.NewValue);
+        }
+
+        protected virtual void OnOffContentChanged(object oldContent, object newContent)
         {
-            get { return (Style)GetValue(ToggleSwitchButtonStyleProperty); }
-            set { SetValue(ToggleSwitchButtonStyleProperty, value); }
         }
 
         /// <summary>
-        /// Gets/sets whether the control is Checked (On) or not (Off).
+        /// Provides the object content that should be displayed using the OffContentTemplate when this ToggleSwitch has state of "Off".
         /// </summary>
-        [TypeConverter(typeof(NullableBoolConverter))]
-        public bool? IsChecked
+        [Category(AppName.MahApps)]
+        public object OffContent
         {
-            get { return (bool?)GetValue(IsCheckedProperty); }
-            set { SetValue(IsCheckedProperty, value); }
+            get => this.GetValue(OffContentProperty);
+            set => this.SetValue(OffContentProperty, value);
         }
 
+        /// <summary>Identifies the <see cref="OffContentTemplate"/> dependency property.</summary>
+        public static readonly DependencyProperty OffContentTemplateProperty
+            = DependencyProperty.Register(nameof(OffContentTemplate),
+                                          typeof(DataTemplate),
+                                          typeof(ToggleSwitch));
+
         /// <summary>
-        /// Gets/sets the command which will be executed if the IsChecked property was changed.
+        /// Gets or sets the DataTemplate used to display the control's content while in "Off" state.
         /// </summary>
-        public ICommand CheckChangedCommand
+        [Category(AppName.MahApps)]
+        public DataTemplate OffContentTemplate
         {
-            get { return (ICommand)GetValue(CheckChangedCommandProperty); }
-            set { SetValue(CheckChangedCommandProperty, value); }
+            get => (DataTemplate)this.GetValue(OffContentTemplateProperty);
+            set => this.SetValue(OffContentTemplateProperty, value);
         }
 
+        /// <summary>Identifies the <see cref="OffContentTemplateSelector"/> dependency property.</summary>
+        public static readonly DependencyProperty OffContentTemplateSelectorProperty
+            = DependencyProperty.Register(nameof(OffContentTemplateSelector),
+                                          typeof(DataTemplateSelector),
+                                          typeof(ToggleSwitch),
+                                          new FrameworkPropertyMetadata((DataTemplateSelector)null));
+
         /// <summary>
-        /// Gets/sets the command which will be executed if the checked event of the control is fired.
+        /// Gets or sets a template selector for OffContent property that enables an application writer to provide custom template-selection logic .
         /// </summary>
-        public ICommand CheckedCommand
+        /// <remarks> 
+        /// This property is ignored if <seealso cref="OffContentTemplate"/> is set.
+        /// </remarks>
+        [Bindable(true)]
+        [Category(AppName.MahApps)]
+        public DataTemplateSelector OffContentTemplateSelector
         {
-            get { return (ICommand)GetValue(CheckedCommandProperty); }
-            set { SetValue(CheckedCommandProperty, value); }
+            get => (DataTemplateSelector)this.GetValue(OffContentTemplateSelectorProperty);
+            set => this.SetValue(OffContentTemplateSelectorProperty, value);
         }
 
+        /// <summary>Identifies the <see cref="OffContentStringFormat"/> dependency property.</summary>
+        public static readonly DependencyProperty OffContentStringFormatProperty
+            = DependencyProperty.Register(nameof(OffContentStringFormat),
+                                          typeof(string),
+                                          typeof(ToggleSwitch),
+                                          new FrameworkPropertyMetadata((string)null));
+
         /// <summary>
-        /// Gets/sets the command which will be executed if the checked event of the control is fired.
+        /// Gets or sets a composite string that specifies how to format the OffContent property if it is displayed as a string.
         /// </summary>
-        public ICommand UnCheckedCommand
+        /// <remarks> 
+        /// This property is ignored if <seealso cref="OffContentTemplate"/> is set.
+        /// </remarks>
+        [Bindable(true)]
+        [Category(AppName.MahApps)]
+        public string OffContentStringFormat
+        {
+            get => (string)this.GetValue(OffContentStringFormatProperty);
+            set => this.SetValue(OffContentStringFormatProperty, value);
+        }
+
+        private static readonly DependencyPropertyKey IsPressedPropertyKey
+            = DependencyProperty.RegisterReadOnly(nameof(IsPressed),
+                                                  typeof(bool),
+                                                  typeof(ToggleSwitch),
+                                                  null);
+
+        /// <summary>Identifies the <see cref="IsPressed"/> dependency property.</summary>
+        public static readonly DependencyProperty IsPressedProperty = IsPressedPropertyKey.DependencyProperty;
+
+        [Browsable(false)]
+        [ReadOnly(true)]
+        [Category(AppName.MahApps)]
+        public bool IsPressed
         {
-            get { return (ICommand)GetValue(UnCheckedCommandProperty); }
-            set { SetValue(UnCheckedCommandProperty, value); }
+            get => (bool)this.GetValue(IsPressedProperty);
+            protected set => this.SetValue(IsPressedPropertyKey, value);
         }
 
+        /// <summary>Identifies the <see cref="Command"/> dependency property.</summary>
+        public static readonly DependencyProperty CommandProperty
+            = DependencyProperty.Register(nameof(Command),
+                                          typeof(ICommand),
+                                          typeof(ToggleSwitch),
+                                          new PropertyMetadata(null, OnCommandChanged));
+
         /// <summary>
-        /// Gets/sets the command parameter which will be passed by the CheckChangedCommand.
+        /// Gets or sets a command which will be executed when the <see cref="IsOnProperty"/> changes.
         /// </summary>
-        public object CheckChangedCommandParameter
+        public ICommand Command
         {
-            get { return (object)GetValue(CheckChangedCommandParameterProperty); }
-            set { SetValue(CheckChangedCommandParameterProperty, value); }
+            get => (ICommand)this.GetValue(CommandProperty);
+            set => this.SetValue(CommandProperty, value);
         }
 
+        /// <summary>Identifies the <see cref="CommandParameter"/> dependency property.</summary>
+        public static readonly DependencyProperty CommandParameterProperty
+            = DependencyProperty.Register(nameof(CommandParameter),
+                                          typeof(object),
+                                          typeof(ToggleSwitch),
+                                          new PropertyMetadata(null));
+
         /// <summary>
-        /// Gets/sets the command parameter which will be passed by the CheckedCommand.
+        /// Gets or sets the command parameter which will be passed by the Command.
         /// </summary>
-        public object CheckedCommandParameter
+        public object CommandParameter
         {
-            get { return (object)GetValue(CheckedCommandParameterProperty); }
-            set { SetValue(CheckedCommandParameterProperty, value); }
+            get => this.GetValue(CommandParameterProperty);
+            set => this.SetValue(CommandParameterProperty, value);
         }
 
+        /// <summary>Identifies the <see cref="CommandTarget"/> dependency property.</summary>
+        public static readonly DependencyProperty CommandTargetProperty
+            = DependencyProperty.Register(nameof(CommandTarget),
+                                          typeof(IInputElement),
+                                          typeof(ToggleSwitch),
+                                          new PropertyMetadata(null));
+
         /// <summary>
-        /// Gets/sets the command parameter which will be passed by the UnCheckedCommand.
+        /// Gets or sets the element on which to raise the specified Command.
         /// </summary>
-        public object UnCheckedCommandParameter
+        /// <returns>
+        /// Element on which to raise the Command.
+        /// </returns>
+        public IInputElement CommandTarget
         {
-            get { return (object)GetValue(UnCheckedCommandParameterProperty); }
-            set { SetValue(UnCheckedCommandParameterProperty, value); }
+            get => (IInputElement)this.GetValue(CommandTargetProperty);
+            set => this.SetValue(CommandTargetProperty, value);
         }
 
         /// <summary>
-        /// An event that is raised when the value of IsChecked changes.
+        /// Occurs when "On"/"Off" state changes for this ToggleSwitch.
         /// </summary>
-        public event EventHandler IsCheckedChanged;
+        public event RoutedEventHandler Toggled;
 
-        private static void OnIsCheckedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        /// <summary>This method is invoked when the <see cref="IsOnProperty"/> changes.</summary>
+        protected virtual void OnToggled()
         {
-            var toggleSwitch = (ToggleSwitch)d;
-            if (toggleSwitch._toggleButton != null)
-            {
-                var oldValue = (bool?)e.OldValue;
-                var newValue = (bool?)e.NewValue;
-
-                if (oldValue != newValue)
-                {
-                    var command = toggleSwitch.CheckChangedCommand;
-                    var commandParameter = toggleSwitch.CheckChangedCommandParameter ?? toggleSwitch;
-                    if (command != null && command.CanExecute(commandParameter))
-                    {
-                        command.Execute(commandParameter);
-                    }
-
-                    var eh = toggleSwitch.IsCheckedChanged;
-                    if (eh != null)
-                    {
-                        eh(toggleSwitch, EventArgs.Empty);
-                    }
-                }
-            }
+            this.Toggled?.Invoke(this, new RoutedEventArgs());
         }
 
         static ToggleSwitch()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(ToggleSwitch), new FrameworkPropertyMetadata(typeof(ToggleSwitch)));
+            EventManager.RegisterClassHandler(typeof(ToggleSwitch), MouseLeftButtonDownEvent, new MouseButtonEventHandler(OnMouseLeftButtonDown), true);
         }
 
         public ToggleSwitch()
         {
-            PreviewKeyUp += ToggleSwitch_PreviewKeyUp;
-            MouseUp += (sender, args) => Keyboard.Focus(this);
+            this.IsEnabledChanged += this.OnIsEnabledChanged;
         }
 
-        void ToggleSwitch_PreviewKeyUp(object sender, System.Windows.Input.KeyEventArgs e)
+        public override void OnApplyTemplate()
         {
-            if (e.Key == System.Windows.Input.Key.Space && e.OriginalSource == sender)
+            if (this.SwitchKnobBounds != null && this.SwitchKnob != null && this.KnobTranslateTransform != null && this.SwitchThumb != null)
             {
-                this.SetCurrentValue(ToggleSwitch.IsCheckedProperty, !IsChecked);
+                this.SwitchThumb.DragStarted -= this.OnSwitchThumbDragStarted;
+                this.SwitchThumb.DragDelta -= this.OnSwitchThumbDragDelta;
+                this.SwitchThumb.DragCompleted -= this.OnSwitchThumbDragCompleted;
             }
+
+            base.OnApplyTemplate();
+
+            this.HeaderContentPresenter = this.GetTemplateChild(nameof(this.HeaderContentPresenter)) as ContentPresenter;
+            this.ContentPresenter = this.GetTemplateChild(nameof(this.ContentPresenter)) as ContentPresenter;
+            this.OffContentPresenter = this.GetTemplateChild(nameof(this.OffContentPresenter)) as ContentPresenter;
+            this.OnContentPresenter = this.GetTemplateChild(nameof(this.OnContentPresenter)) as ContentPresenter;
+            this.SwitchKnobBounds = this.GetTemplateChild(nameof(this.SwitchKnobBounds)) as FrameworkElement;
+            this.SwitchKnob = this.GetTemplateChild(nameof(this.SwitchKnob)) as FrameworkElement;
+            this.KnobTranslateTransform = this.GetTemplateChild(nameof(this.KnobTranslateTransform)) as TranslateTransform;
+            this.SwitchThumb = this.GetTemplateChild(nameof(this.SwitchThumb)) as Thumb;
+
+            if (this.SwitchKnobBounds != null && this.SwitchKnob != null && this.KnobTranslateTransform != null && this.SwitchThumb != null)
+            {
+                this.SwitchThumb.DragStarted += this.OnSwitchThumbDragStarted;
+                this.SwitchThumb.DragDelta += this.OnSwitchThumbDragDelta;
+                this.SwitchThumb.DragCompleted += this.OnSwitchThumbDragCompleted;
+            }
+
+            this.UpdateHeaderContentPresenterVisibility();
+            this.UpdateContentPresenterVisibility();
+
+            this.UpdateVisualStates(false);
         }
 
-        private void ChangeVisualState(bool useTransitions)
+        private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-            VisualStateManager.GoToState(this, IsEnabled ? NormalState : DisabledState, useTransitions);
+            this.UpdateVisualStates(true);
         }
 
-        public override void OnApplyTemplate()
+        private static void OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            base.OnApplyTemplate();
+            if (sender is ToggleSwitch toggle && !toggle.IsKeyboardFocusWithin)
+            {
+                e.Handled = toggle.Focus() || e.Handled;
+            }
+        }
 
-            if (_toggleButton != null)
+        protected override void OnKeyUp(KeyEventArgs e)
+        {
+            if (e.Key == Key.Space)
             {
-                _toggleButton.Checked -= CheckedHandler;
-                _toggleButton.Unchecked -= UncheckedHandler;
-                _toggleButton.Indeterminate -= IndeterminateHandler;
-                _toggleButton.Click -= ClickHandler;
-                BindingOperations.ClearBinding(_toggleButton, ToggleButton.IsCheckedProperty);
+                e.Handled = true;
+                this.Toggle();
+            }
 
-                _toggleButton.IsEnabledChanged -= IsEnabledHandler;
+            base.OnKeyUp(e);
+        }
+
+        protected override void OnHeaderChanged(object oldHeader, object newHeader)
+        {
+            base.OnHeaderChanged(oldHeader, newHeader);
+
+            this.UpdateHeaderContentPresenterVisibility();
+        }
 
-                _toggleButton.PreviewMouseUp -= this.ToggleButtonPreviewMouseUp;
+        private void UpdateHeaderContentPresenterVisibility()
+        {
+            if (this.HeaderContentPresenter == null)
+            {
+                return;
+            }
+
+            bool showHeader = (this.Header is string s && !string.IsNullOrEmpty(s)) || this.Header != null;
+            this.HeaderContentPresenter.Visibility = showHeader ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        protected override void OnContentChanged(object oldContent, object newContent)
+        {
+            base.OnContentChanged(oldContent, newContent);
+
+            this.UpdateContentPresenterVisibility();
+        }
+
+        private void UpdateContentPresenterVisibility()
+        {
+            if (this.ContentPresenter == null)
+            {
+                return;
             }
-            _toggleButton = GetTemplateChild(SwitchPart) as ToggleButton;
-            if (_toggleButton != null)
+
+            bool showContent = (this.Content is string s && !string.IsNullOrEmpty(s)) || this.Content != null;
+            this.ContentPresenter.Visibility = showContent ? Visibility.Visible : Visibility.Collapsed;
+            this.OffContentPresenter.Visibility = !showContent ? Visibility.Visible : Visibility.Collapsed;
+            this.OnContentPresenter.Visibility = !showContent ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+        {
+            base.OnPropertyChanged(e);
+
+            if (e.Property == IsMouseOverProperty)
             {
-                _toggleButton.Checked += CheckedHandler;
-                _toggleButton.Unchecked += UncheckedHandler;
-                _toggleButton.Indeterminate += IndeterminateHandler;
-                _toggleButton.Click += ClickHandler;
-                var binding = new Binding("IsChecked") { Source = this };
-                _toggleButton.SetBinding(ToggleButton.IsCheckedProperty, binding);
+                this.UpdateVisualStates(true);
+            }
+        }
 
-                _toggleButton.IsEnabledChanged += IsEnabledHandler;
+        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+        {
+            base.OnRenderSizeChanged(sizeInfo);
 
-                _toggleButton.PreviewMouseUp += this.ToggleButtonPreviewMouseUp;
+            if (this.SwitchKnobBounds != null && this.SwitchKnob != null)
+            {
+                this.onTranslation = this.SwitchKnobBounds.ActualWidth - this.SwitchKnob.ActualWidth - this.SwitchKnob.Margin.Left - this.SwitchKnob.Margin.Right;
             }
-            ChangeVisualState(false);
         }
 
-        private void ToggleButtonPreviewMouseUp(object sender, MouseButtonEventArgs e)
+        private void OnSwitchThumbDragStarted(object sender, DragStartedEventArgs e)
         {
-            Keyboard.Focus(this);
+            e.Handled = true;
+            this.IsPressed = true;
+            this.wasDragged = false;
+            this.startTranslation = this.KnobTranslateTransform.X;
+            this.UpdateVisualStates(true);
+            this.KnobTranslateTransform.X = this.startTranslation;
+        }
+
+        private void OnSwitchThumbDragDelta(object sender, DragDeltaEventArgs e)
+        {
+            e.Handled = true;
+            if (e.HorizontalChange != 0)
+            {
+                this.wasDragged = Math.Abs(e.HorizontalChange) >= SystemParameters.MinimumHorizontalDragDistance;
+                double dragTranslation = this.startTranslation + e.HorizontalChange;
+                this.KnobTranslateTransform.X = Math.Max(0, Math.Min(this.onTranslation, dragTranslation));
+            }
         }
 
-        private void IsEnabledHandler(object sender, DependencyPropertyChangedEventArgs e)
+        private void OnSwitchThumbDragCompleted(object sender, DragCompletedEventArgs e)
         {
-            ChangeVisualState(false);
+            e.Handled = true;
+            this.IsPressed = false;
+            if (this.wasDragged)
+            {
+                if (!this.IsOn && this.KnobTranslateTransform.X + this.SwitchKnob.ActualWidth / 2 >= this.SwitchKnobBounds.ActualWidth / 2)
+                {
+                    this.Toggle();
+                }
+                else if (this.IsOn && this.KnobTranslateTransform.X + this.SwitchKnob.ActualWidth / 2 <= this.SwitchKnobBounds.ActualWidth / 2)
+                {
+                    this.Toggle();
+                }
+                else
+                {
+                    this.UpdateVisualStates(true);
+                }
+            }
+            else
+            {
+                this.Toggle();
+            }
+
+            this.wasDragged = false;
         }
 
-        private void CheckedHandler(object sender, RoutedEventArgs e)
+        private void UpdateVisualStates(bool useTransitions)
         {
-            var command = this.CheckedCommand;
-            var commandParameter = this.CheckedCommandParameter ?? this;
-            if (command != null && command.CanExecute(commandParameter))
+            string stateName;
+
+            if (!this.IsEnabled)
+            {
+                stateName = VisualStates.StateDisabled;
+            }
+            else if (this.IsPressed)
             {
-                command.Execute(commandParameter);
+                stateName = VisualStates.StatePressed;
             }
-            
-            SafeRaise.Raise(Checked, this, e);
+            else if (this.IsMouseOver)
+            {
+                stateName = VisualStates.StateMouseOver;
+            }
+            else
+            {
+                stateName = VisualStates.StateNormal;
+            }
+
+            VisualStateManager.GoToState(this, stateName, useTransitions);
+
+            if (this.SwitchThumb != null && this.SwitchThumb.IsDragging)
+            {
+                stateName = DraggingState;
+            }
+            else
+            {
+                stateName = this.IsOn ? OnState : OffState;
+            }
+
+            VisualStateManager.GoToState(this, stateName, useTransitions);
+
+            VisualStateManager.GoToState(this, this.IsOn ? OnContentState : OffContentState, useTransitions);
+        }
+
+        private void Toggle()
+        {
+            this.SetCurrentValue(IsOnProperty, !this.IsOn);
+
+            CommandHelpers.ExecuteCommandSource(this);
         }
 
-        private void UncheckedHandler(object sender, RoutedEventArgs e)
+        private static void OnCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var command = this.UnCheckedCommand;
-            var commandParameter = this.UnCheckedCommandParameter ?? this;
-            if (command != null && command.CanExecute(commandParameter))
+            ((ToggleSwitch)d).OnCommandChanged((ICommand)e.OldValue, (ICommand)e.NewValue);
+        }
+
+        private void OnCommandChanged(ICommand oldCommand, ICommand newCommand)
+        {
+            if (oldCommand != null)
+            {
+                this.UnhookCommand(oldCommand);
+            }
+
+            if (newCommand != null)
             {
-                command.Execute(commandParameter);
+                this.HookCommand(newCommand);
             }
+        }
 
-            SafeRaise.Raise(Unchecked, this, e);
+        private void UnhookCommand(ICommand command)
+        {
+            CanExecuteChangedEventManager.RemoveHandler(command, this.OnCanExecuteChanged);
+            this.UpdateCanExecute();
         }
 
-        private void IndeterminateHandler(object sender, RoutedEventArgs e)
+        private void HookCommand(ICommand command)
         {
-            SafeRaise.Raise(Indeterminate, this, e);
+            CanExecuteChangedEventManager.AddHandler(command, this.OnCanExecuteChanged);
+            this.UpdateCanExecute();
         }
 
-        private void ClickHandler(object sender, RoutedEventArgs e)
+        private void OnCanExecuteChanged(object sender, EventArgs e)
         {
-            SafeRaise.Raise(Click, this, e);
+            this.UpdateCanExecute();
         }
 
-        public override string ToString()
+        private void UpdateCanExecute()
         {
-            return string.Format(
-                CultureInfo.InvariantCulture,
-                "{{ToggleSwitch IsChecked={0}, Content={1}}}",
-                IsChecked,
-                Content
-            );
+            this.CanExecute = this.Command == null || CommandHelpers.CanExecuteCommandSource(this);
+        }
+
+        /// <inheritdoc />
+        protected override bool IsEnabledCore => base.IsEnabledCore && this.CanExecute;
+
+        private bool canExecute = true;
+
+        private bool CanExecute
+        {
+            get => this.canExecute;
+            set
+            {
+                if (value == this.canExecute)
+                {
+                    return;
+                }
+
+                this.canExecute = value;
+                this.CoerceValue(IsEnabledProperty);
+            }
         }
-    }
-}
 
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new ToggleSwitchAutomationPeer(this);
+        }
 
+        internal void AutomationPeerToggle()
+        {
+            this.Toggle();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/MahApps.Metro/Controls/ToggleSwitchAutomationPeer.cs b/src/MahApps.Metro/Controls/ToggleSwitchAutomationPeer.cs
new file mode 100644
index 0000000000..1ffd5a2298
--- /dev/null
+++ b/src/MahApps.Metro/Controls/ToggleSwitchAutomationPeer.cs
@@ -0,0 +1,38 @@
+using System.Windows.Automation;
+using System.Windows.Automation.Peers;
+using JetBrains.Annotations;
+
+namespace MahApps.Metro.Controls
+{
+    public class ToggleSwitchAutomationPeer : FrameworkElementAutomationPeer
+    {
+        /// <summary>Initializes a new instance of the <see cref="T:MahApps.Metro.Controls.ToggleSwitchAutomationPeer" /> class.</summary>
+        /// <param name="owner">The <see cref="T:MahApps.Metro.Controls.ToggleSwitch" /> associated with this <see cref="T:MahApps.Metro.Controls.ToggleSwitchAutomationPeer" />.</param>
+        public ToggleSwitchAutomationPeer([NotNull] ToggleSwitch owner)
+            : base(owner)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override string GetClassNameCore()
+        {
+            return "ToggleSwitch";
+        }
+
+        /// <inheritdoc />
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.Button;
+        }
+
+        public ToggleState ToggleState => ((ToggleSwitch)this.Owner).IsOn ? ToggleState.On : ToggleState.Off;
+
+        public void Toggle()
+        {
+            if (this.IsEnabled())
+            {
+                ((ToggleSwitch)this.Owner).AutomationPeerToggle();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/MahApps.Metro/Controls/ToggleSwitchButton.cs b/src/MahApps.Metro/Controls/ToggleSwitchButton.cs
deleted file mode 100644
index 0a1157b5a5..0000000000
--- a/src/MahApps.Metro/Controls/ToggleSwitchButton.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-using System;
-using System.Reflection;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Data;
-using ControlzEx;
-
-namespace MahApps.Metro.Controls
-{
-    /// <summary>
-    /// A Button that allows the user to toggle between two states.
-    /// </summary>
-    [TemplatePart(Name = PART_BackgroundTranslate, Type = typeof(TranslateTransform))]
-    [TemplatePart(Name = PART_DraggingThumb, Type = typeof(Thumb))]
-    [TemplatePart(Name = PART_SwitchTrack, Type = typeof(Grid))]
-    [TemplatePart(Name = PART_ThumbIndicator, Type = typeof(FrameworkElement))]
-    [TemplatePart(Name = PART_ThumbTranslate, Type = typeof(TranslateTransform))]
-    public class ToggleSwitchButton : ToggleButton
-    {
-        private const string PART_BackgroundTranslate = "PART_BackgroundTranslate";
-        private const string PART_DraggingThumb = "PART_DraggingThumb";
-        private const string PART_SwitchTrack = "PART_SwitchTrack";
-        private const string PART_ThumbIndicator = "PART_ThumbIndicator";
-        private const string PART_ThumbTranslate = "PART_ThumbTranslate";
-
-        private TranslateTransform _BackgroundTranslate;
-        private Thumb _DraggingThumb;
-        private Grid _SwitchTrack;
-        private FrameworkElement _ThumbIndicator;
-        private TranslateTransform _ThumbTranslate;
-        private readonly PropertyChangeNotifier isCheckedPropertyChangeNotifier;
-
-        public static readonly DependencyProperty OnSwitchBrushProperty = DependencyProperty.Register("OnSwitchBrush", typeof(Brush), typeof(ToggleSwitchButton), null);
-        public static readonly DependencyProperty OffSwitchBrushProperty = DependencyProperty.Register("OffSwitchBrush", typeof(Brush), typeof(ToggleSwitchButton), null);
-
-        public static readonly DependencyProperty ThumbIndicatorBrushProperty = DependencyProperty.Register("ThumbIndicatorBrush", typeof(Brush), typeof(ToggleSwitchButton), null);
-        public static readonly DependencyProperty ThumbIndicatorDisabledBrushProperty = DependencyProperty.Register("ThumbIndicatorDisabledBrush", typeof(Brush), typeof(ToggleSwitchButton), null);
-        public static readonly DependencyProperty ThumbIndicatorWidthProperty = DependencyProperty.Register("ThumbIndicatorWidth", typeof(double), typeof(ToggleSwitchButton), new PropertyMetadata(13d));
-
-        /// <summary>
-        /// Gets/sets the brush used for the on-switch's foreground.
-        /// </summary>
-        public Brush OnSwitchBrush
-        {
-            get { return (Brush)GetValue(OnSwitchBrushProperty); }
-            set { SetValue(OnSwitchBrushProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets/sets the brush used for the off-switch's foreground.
-        /// </summary>
-        public Brush OffSwitchBrush
-        {
-            get { return (Brush)GetValue(OffSwitchBrushProperty); }
-            set { SetValue(OffSwitchBrushProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets/sets the brush used for the thumb indicator.
-        /// </summary>
-        public Brush ThumbIndicatorBrush
-        {
-            get { return (Brush)GetValue(ThumbIndicatorBrushProperty); }
-            set { SetValue(ThumbIndicatorBrushProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets/sets the brush used for the thumb indicator.
-        /// </summary>
-        public Brush ThumbIndicatorDisabledBrush
-        {
-            get { return (Brush)GetValue(ThumbIndicatorDisabledBrushProperty); }
-            set { SetValue(ThumbIndicatorDisabledBrushProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets/sets the width of the thumb indicator.
-        /// </summary>
-        public double ThumbIndicatorWidth
-        {
-            get { return (double)GetValue(ThumbIndicatorWidthProperty); }
-            set { SetValue(ThumbIndicatorWidthProperty, value); }
-        }
-
-        static ToggleSwitchButton()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(ToggleSwitchButton), new FrameworkPropertyMetadata(typeof(ToggleSwitchButton)));
-        }
-
-        public ToggleSwitchButton()
-        {
-            isCheckedPropertyChangeNotifier = new PropertyChangeNotifier(this, ToggleSwitchButton.IsCheckedProperty);
-            isCheckedPropertyChangeNotifier.ValueChanged += IsCheckedPropertyChangeNotifierValueChanged;
-        }
-
-        private void IsCheckedPropertyChangeNotifierValueChanged(object sender, EventArgs e)
-        {
-            UpdateThumb();
-        }
-
-        DoubleAnimation _thumbAnimation;
-        private void UpdateThumb()
-        {
-            if (_ThumbTranslate != null && _SwitchTrack != null && _ThumbIndicator != null)
-            {
-                double destination = IsChecked.GetValueOrDefault() ? ActualWidth - (_SwitchTrack.Margin.Left + _SwitchTrack.Margin.Right + _ThumbIndicator.ActualWidth + _ThumbIndicator.Margin.Left + _ThumbIndicator.Margin.Right) : 0;
-
-                _thumbAnimation = new DoubleAnimation();
-                _thumbAnimation.To = destination;
-                _thumbAnimation.Duration = TimeSpan.FromMilliseconds(500);
-                _thumbAnimation.EasingFunction = new ExponentialEase() { Exponent = 9 };
-                _thumbAnimation.FillBehavior = FillBehavior.Stop;
-
-                AnimationTimeline currentAnimation = _thumbAnimation;
-                _thumbAnimation.Completed += (sender, e) => {
-                    if (_thumbAnimation != null && currentAnimation == _thumbAnimation)
-                    {
-                        _ThumbTranslate.X = destination;
-                        _thumbAnimation = null;
-                    }
-                };
-                _ThumbTranslate.BeginAnimation(TranslateTransform.XProperty, _thumbAnimation);
-            }
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-            _BackgroundTranslate = GetTemplateChild(PART_BackgroundTranslate) as TranslateTransform;
-            _DraggingThumb = GetTemplateChild(PART_DraggingThumb) as Thumb;
-            _SwitchTrack = GetTemplateChild(PART_SwitchTrack) as Grid;
-            _ThumbIndicator = GetTemplateChild(PART_ThumbIndicator) as FrameworkElement;
-            _ThumbTranslate = GetTemplateChild(PART_ThumbTranslate) as TranslateTransform;
-
-            if (_ThumbIndicator != null && _ThumbTranslate != null && _BackgroundTranslate != null)
-            {
-                Binding translationBinding;
-                translationBinding = new System.Windows.Data.Binding("X");
-                translationBinding.Source = _ThumbTranslate;
-                BindingOperations.SetBinding(_BackgroundTranslate, TranslateTransform.XProperty, translationBinding);
-            }
-
-            if (_DraggingThumb != null && _ThumbIndicator != null && _ThumbTranslate != null)
-            {
-                _DraggingThumb.DragStarted -= _DraggingThumb_DragStarted;
-                _DraggingThumb.DragDelta -= _DraggingThumb_DragDelta;
-                _DraggingThumb.DragCompleted -= _DraggingThumb_DragCompleted;
-                _DraggingThumb.DragStarted += _DraggingThumb_DragStarted;
-                _DraggingThumb.DragDelta += _DraggingThumb_DragDelta;
-                _DraggingThumb.DragCompleted += _DraggingThumb_DragCompleted;
-                if (_SwitchTrack != null)
-                {
-                    _SwitchTrack.SizeChanged -= _SwitchTrack_SizeChanged;
-                    _SwitchTrack.SizeChanged += _SwitchTrack_SizeChanged;
-                }
-            }
-        }
-
-        private void SetIsPressed(bool pressed)
-        {
-            // we can't use readonly IsPressedProperty
-            typeof(ToggleButton).GetMethod("set_IsPressed", BindingFlags.Instance | BindingFlags.NonPublic)
-                                .Invoke(this, new object[] { pressed });
-        }
-
-        private double? _lastDragPosition;
-        private bool _isDragging;
-        void _DraggingThumb_DragStarted(object sender, DragStartedEventArgs e)
-        {
-            if (Mouse.LeftButton == MouseButtonState.Pressed)
-            {
-                if (!IsPressed)
-                {
-                    SetIsPressed(true);
-                }
-            }
-            if (_ThumbTranslate != null)
-            {
-                _ThumbTranslate.BeginAnimation(TranslateTransform.XProperty, null);
-                double destination = IsChecked.GetValueOrDefault() ? ActualWidth - (_SwitchTrack.Margin.Left + _SwitchTrack.Margin.Right + _ThumbIndicator.ActualWidth + _ThumbIndicator.Margin.Left + _ThumbIndicator.Margin.Right) : 0;
-                _ThumbTranslate.X = destination;
-                _thumbAnimation = null;
-            }
-            _lastDragPosition = _ThumbTranslate.X;
-            _isDragging = false;
-        }
-
-        void _DraggingThumb_DragDelta(object sender, DragDeltaEventArgs e)
-        {
-            if (_lastDragPosition.HasValue)
-            {
-                if (Math.Abs(e.HorizontalChange) > 3)
-                    _isDragging = true;
-                if (_SwitchTrack != null && _ThumbIndicator != null)
-                {
-                    double lastDragPosition = _lastDragPosition.Value;
-                    _ThumbTranslate.X = Math.Min(ActualWidth - (_SwitchTrack.Margin.Left + _SwitchTrack.Margin.Right + _ThumbIndicator.ActualWidth + _ThumbIndicator.Margin.Left + _ThumbIndicator.Margin.Right), Math.Max(0, lastDragPosition + e.HorizontalChange));
-                }
-            }
-        }
-
-        void _DraggingThumb_DragCompleted(object sender, DragCompletedEventArgs e)
-        {
-            SetIsPressed(false);
-            _lastDragPosition = null;
-            if (!_isDragging)
-            {
-                OnClick();
-            }
-            else if (_ThumbTranslate != null && _SwitchTrack != null)
-            {
-                if (!IsChecked.GetValueOrDefault() && _ThumbTranslate.X + 6.5 >= _SwitchTrack.ActualWidth / 2)
-                {
-                    OnClick();
-                }
-                else if (IsChecked.GetValueOrDefault() && _ThumbTranslate.X + 6.5 <= _SwitchTrack.ActualWidth / 2)
-                {
-                    OnClick();
-                }
-                UpdateThumb();
-            }
-        }
-
-        void _SwitchTrack_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            if (_ThumbTranslate != null && _SwitchTrack != null && _ThumbIndicator != null)
-            {
-                double destination = IsChecked.GetValueOrDefault() ? ActualWidth - (_SwitchTrack.Margin.Left + _SwitchTrack.Margin.Right + _ThumbIndicator.ActualWidth + _ThumbIndicator.Margin.Left + _ThumbIndicator.Margin.Right) : 0;
-                _ThumbTranslate.X = destination;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/MahApps.Metro/Converters/RectangleHeightToRadiusConverter.cs b/src/MahApps.Metro/Converters/RectangleHeightToRadiusConverter.cs
deleted file mode 100644
index f9cdd8aa1e..0000000000
--- a/src/MahApps.Metro/Converters/RectangleHeightToRadiusConverter.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-using System.Windows.Markup;
-
-namespace MahApps.Metro.Converters
-{
-    [ValueConversion(typeof(double?), typeof(double))]
-    [MarkupExtensionReturnType(typeof(RectangleHeightToRadiusConverter))]
-    public class RectangleHeightToRadiusConverter : MarkupConverter
-    {
-        private static RectangleHeightToRadiusConverter _instance;
-
-        // Explicit static constructor to tell C# compiler
-        // not to mark type as beforefieldinit
-        static RectangleHeightToRadiusConverter()
-        {
-        }
-
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return _instance ?? (_instance = new RectangleHeightToRadiusConverter());
-        }
-
-        protected override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            var height = value as double?;
-            return height.GetValueOrDefault(0) / 2d;
-        }
-
-        protected override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return DependencyProperty.UnsetValue;
-        }
-    }
-}
\ 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 9d6cb3e141..2638228c2c 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -389,9 +389,9 @@
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="Controls:ControlsHelper.CornerRadius" Value="3" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.Border.MouseOver}" />
         <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" />
@@ -430,8 +430,8 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <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="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush), Mode=OneWay}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
                             <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
@@ -596,13 +596,13 @@
 
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="MouseOverRectangle" Property="Opacity" Value="1" />
                             <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Button.AccentedSquare.Foreground.MouseOver}" />
+                            <Setter TargetName="MouseOverRectangle" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="MouseOverRectangle" Property="Opacity" Value="0" />
                             <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
                             <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+                            <Setter TargetName="MouseOverRectangle" Property="Opacity" Value="0" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -767,8 +767,8 @@
         <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.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.Border.MouseOver}" />
         <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" />
diff --git a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
deleted file mode 100644
index d334e1e5b6..0000000000
--- a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ /dev/null
@@ -1,308 +0,0 @@
-<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:system="clr-namespace:System;assembly=mscorlib">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/ToggleSwitch.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <!--  Win10 style  -->
-
-    <system:Double x:Key="ToggleSwitchOnStrokeThickness">0</system:Double>
-    <system:Double x:Key="ToggleSwitchOffStrokeThickness">2</system:Double>
-    <system:Double x:Key="ToggleSwitchThemeMinWidth">154</system:Double>
-
-    <Style x:Key="MahApps.Styles.ToggleSwitchButton.Win10"
-           BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton}"
-           TargetType="{x:Type Controls:ToggleSwitchButton}">
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Height" Value="20" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOff}" />
-        <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOn}" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:ToggleSwitchButton}">
-                    <Grid>
-                        <Grid x:Name="PART_SwitchTrack"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                              UseLayoutRounding="False">
-                            <Rectangle x:Name="OuterBorder"
-                                       Width="{TemplateBinding Width}"
-                                       Height="{TemplateBinding Height}"
-                                       Fill="{TemplateBinding OffSwitchBrush}"
-                                       RadiusX="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Height, Converter={converters:RectangleHeightToRadiusConverter}, Mode=OneWay}"
-                                       RadiusY="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Height, Converter={converters:RectangleHeightToRadiusConverter}, Mode=OneWay}"
-                                       Stroke="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOff}"
-                                       StrokeThickness="{DynamicResource ToggleSwitchOffStrokeThickness}" />
-                            <Rectangle x:Name="SwitchKnobBounds"
-                                       Width="{TemplateBinding Width}"
-                                       Height="{TemplateBinding Height}"
-                                       Fill="{TemplateBinding OnSwitchBrush}"
-                                       Opacity="0"
-                                       RadiusX="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Height, Converter={converters:RectangleHeightToRadiusConverter}, Mode=OneWay}"
-                                       RadiusY="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Height, Converter={converters:RectangleHeightToRadiusConverter}, Mode=OneWay}"
-                                       Stroke="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOn}"
-                                       StrokeThickness="{DynamicResource ToggleSwitchOnStrokeThickness}" />
-                            <Grid x:Name="PART_ThumbIndicator"
-                                  Width="{TemplateBinding Height}"
-                                  Height="{TemplateBinding Height}"
-                                  HorizontalAlignment="Left"
-                                  VerticalAlignment="Center">
-                                <Grid.RenderTransform>
-                                    <TranslateTransform x:Name="PART_ThumbTranslate" />
-                                </Grid.RenderTransform>
-                                <Ellipse x:Name="SwitchKnobOn"
-                                         Fill="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOn}"
-                                         Width="{TemplateBinding ThumbIndicatorWidth}"
-                                         Height="{TemplateBinding ThumbIndicatorWidth}"
-                                         Opacity="0" />
-                                <Ellipse x:Name="SwitchKnobOff"
-                                         Width="{TemplateBinding ThumbIndicatorWidth}"
-                                         Height="{TemplateBinding ThumbIndicatorWidth}"
-                                         Fill="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOff}" />
-                            </Grid>
-                        </Grid>
-                        <Thumb x:Name="PART_DraggingThumb">
-                            <Thumb.Template>
-                                <ControlTemplate>
-                                    <Rectangle Fill="Transparent" />
-                                </ControlTemplate>
-                            </Thumb.Template>
-                        </Thumb>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <!--  Checked  -->
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="SwitchKnobBounds" Property="Opacity" Value="1" />
-                            <Setter TargetName="OuterBorder" Property="Opacity" Value="0" />
-                            <Setter TargetName="SwitchKnobOn" Property="Opacity" Value="1" />
-                            <Setter TargetName="SwitchKnobOff" Property="Opacity" Value="0" />
-                        </Trigger>
-
-                        <!--  MouseOver  -->
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="OuterBorder" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOffPointerOver}" />
-                            <Setter TargetName="OuterBorder" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOffPointerOver}" />
-                            <Setter TargetName="SwitchKnobOff" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOffPointerOver}" />
-                            <Setter TargetName="SwitchKnobOn" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOnPointerOver}" />
-                            <Setter TargetName="SwitchKnobBounds" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOnPointerOver}" />
-                            <Setter TargetName="SwitchKnobBounds" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOnPointerOver}" />
-                            <!-- <Setter TargetName="SwitchAreaGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContainerBackgroundPointerOver}" /> -->
-                        </Trigger>
-
-                        <!--  Pressed  -->
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="OuterBorder" Property="StrokeThickness" Value="0" />
-                            <Setter TargetName="OuterBorder" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOffPressed}" />
-                            <Setter TargetName="OuterBorder" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOffPressed}" />
-                            <Setter TargetName="SwitchKnobBounds" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOnPressed}" />
-                            <Setter TargetName="SwitchKnobBounds" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOnPressed}" />
-                            <Setter TargetName="SwitchKnobOff" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOffPressed}" />
-                            <Setter TargetName="SwitchKnobOn" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOnPressed}" />
-                            <!-- <Setter TargetName="SwitchAreaGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContainerBackgroundPressed}" /> -->
-                        </Trigger>
-
-                        <!--  Disabled  -->
-                        <Trigger Property="IsEnabled" Value="False">
-                            <!-- <Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.HeaderForegroundDisabled}" /> -->
-                            <!-- <Setter TargetName="OffContentPresenter" Property="Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContentForegroundDisabled}" /> -->
-                            <!-- <Setter TargetName="OnContentPresenter" Property="Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContentForegroundDisabled}" /> -->
-                            <Setter TargetName="OuterBorder" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOffDisabled}" />
-                            <Setter TargetName="OuterBorder" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOffDisabled}" />
-                            <Setter TargetName="SwitchKnobBounds" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOnDisabled}" />
-                            <Setter TargetName="SwitchKnobBounds" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOnDisabled}" />
-                            <Setter TargetName="SwitchKnobOff" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOffDisabled}" />
-                            <Setter TargetName="SwitchKnobOn" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOnDisabled}" />
-                            <!-- <Setter TargetName="SwitchAreaGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContainerBackgroundDisabled}" /> -->
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ThumbIndicatorWidth" Value="10" />
-        <Setter Property="Width" Value="44" />
-    </Style>
-
-    <Style x:Key="MahApps.Styles.ToggleSwitch.Win10"
-           BasedOn="{StaticResource MahApps.Styles.ToggleSwitch}"
-           TargetType="{x:Type Controls:ToggleSwitch}">
-        <Setter Property="ContentDirection" Value="RightToLeft" />
-        <Setter Property="ContentPadding" Value="0 0 12 0" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderMargin" Value="0 0 0 4" />
-        <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="Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContentForeground}" />
-        <Setter Property="HeaderFontFamily" Value="{DynamicResource MahApps.Fonts.Family.ToggleSwitch.Header.Win10}" />
-        <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOff}" />
-        <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOn}" />
-        <Setter Property="ThumbIndicatorWidth" Value="10" />
-        <Setter Property="ToggleSwitchButtonStyle" Value="{StaticResource MahApps.Styles.ToggleSwitchButton.Win10}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:ToggleSwitch}">
-                    <Border Padding="{TemplateBinding Padding}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                        <Grid Background="Transparent">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <ContentPresenter x:Name="HeaderContentPresenter"
-                                              Grid.Row="0"
-                                              Grid.Column="0"
-                                              TextElement.Foreground="{DynamicResource MahApps.Brushes.ToggleSwitch.HeaderForeground}"
-                                              Margin="{TemplateBinding Controls:HeaderedControlHelper.HeaderMargin}"
-                                              Content="{TemplateBinding Header}"
-                                              ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                              ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                              TextElement.FontFamily="{TemplateBinding HeaderFontFamily}"
-                                              TextElement.FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
-                                              TextElement.FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
-                                              IsHitTestVisible="False" />
-                            <Grid Grid.Row="1"
-                                  MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
-                                  HorizontalAlignment="Left"
-                                  VerticalAlignment="Top">
-
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition x:Name="firstCol" Width="Auto" />
-                                    <ColumnDefinition x:Name="secCol" Width="Auto" />
-                                </Grid.ColumnDefinitions>
-
-                                <Grid x:Name="SwitchAreaGrid"
-                                      Grid.ColumnSpan="2"
-                                      Margin="0 5"
-                                      Background="{DynamicResource MahApps.Brushes.ToggleSwitch.ContainerBackground}" />
-
-                                <ContentPresenter x:Name="ContentPresenter"
-                                                  Grid.Row="0"
-                                                  Grid.Column="0"
-                                                  TextElement.Foreground="{TemplateBinding Foreground}"
-                                                  IsHitTestVisible="False"
-                                                  Margin="{TemplateBinding ContentPadding}"
-                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                  Content="{TemplateBinding Content}"
-                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                  TextElement.FontFamily="{TemplateBinding FontFamily}"
-                                                  TextElement.FontSize="{TemplateBinding FontSize}" />
-                                <ContentPresenter x:Name="OnContentPresenter"
-                                                  Grid.Row="0"
-                                                  Grid.Column="0"
-                                                  TextElement.Foreground="{TemplateBinding Foreground}"
-                                                  IsHitTestVisible="False"
-                                                  Margin="{TemplateBinding ContentPadding}"
-                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                  Content="{TemplateBinding OnLabel}"
-                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                  TextElement.FontFamily="{TemplateBinding FontFamily}"
-                                                  TextElement.FontSize="{TemplateBinding FontSize}"
-                                                  Visibility="Hidden" />
-                                <ContentPresenter x:Name="OffContentPresenter"
-                                                  Grid.Row="0"
-                                                  Grid.Column="0"
-                                                  TextElement.Foreground="{TemplateBinding Foreground}"
-                                                  IsHitTestVisible="False"
-                                                  Margin="{TemplateBinding ContentPadding}"
-                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                  Content="{TemplateBinding OffLabel}"
-                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                  TextElement.FontFamily="{TemplateBinding FontFamily}"
-                                                  TextElement.FontSize="{TemplateBinding FontSize}"
-                                                  Visibility="Hidden" />
-                                <Controls:ToggleSwitchButton x:Name="Switch"
-                                                         Grid.Row="0"
-                                                         Grid.Column="1"
-                                                         VerticalAlignment="Center"
-                                                         Background="{TemplateBinding Background}"
-                                                         FocusVisualStyle="{x:Null}"
-                                                         IsChecked="{Binding IsChecked, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                         OffSwitchBrush="{TemplateBinding OffSwitchBrush}"
-                                                         OnSwitchBrush="{TemplateBinding OnSwitchBrush}"
-                                                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                         Style="{TemplateBinding ToggleSwitchButtonStyle}"
-                                                         ThumbIndicatorBrush="{TemplateBinding ThumbIndicatorBrush}"
-                                                         ThumbIndicatorDisabledBrush="{TemplateBinding ThumbIndicatorDisabledBrush}"
-                                                         ThumbIndicatorWidth="{TemplateBinding ThumbIndicatorWidth}" />
-                            </Grid>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsChecked" Value="True" />
-                                <Condition Property="Content" Value="{x:Null}" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="OnContentPresenter" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="OffContentPresenter" Property="Visibility" Value="Hidden" />
-                        </MultiTrigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsChecked" Value="False" />
-                                <Condition Property="Content" Value="{x:Null}" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="OnContentPresenter" Property="Visibility" Value="Hidden" />
-                            <Setter TargetName="OffContentPresenter" Property="Visibility" Value="Visible" />
-                        </MultiTrigger>
-
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Header}" Value="{x:Null}">
-                            <Setter TargetName="HeaderContentPresenter" Property="Visibility" Value="Collapsed" />
-                        </DataTrigger>
-
-                        <Trigger Property="ContentDirection" Value="RightToLeft">
-                            <Setter TargetName="ContentPresenter" Property="Grid.Column" Value="1" />
-                            <Setter TargetName="OffContentPresenter" Property="Grid.Column" Value="1" />
-                            <Setter TargetName="OnContentPresenter" Property="Grid.Column" Value="1" />
-                            <Setter TargetName="Switch" Property="Grid.Column" Value="0" />
-                            <Setter TargetName="firstCol" Property="Width" Value="Auto" />
-                            <Setter TargetName="secCol" Property="Width" Value="Auto" />
-                        </Trigger>
-
-                        <!--  MouseOver  -->
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="SwitchAreaGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContainerBackgroundPointerOver}" />
-                        </Trigger>
-
-                        <!--  Pressed  -->
-                        <Trigger SourceName="Switch" Property="IsPressed" Value="True">
-                            <Setter TargetName="SwitchAreaGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContainerBackgroundPressed}" />
-                        </Trigger>
-
-                        <!--  Disabled  -->
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="HeaderContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.HeaderForegroundDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContentForegroundDisabled}" />
-                            <Setter TargetName="OffContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContentForegroundDisabled}" />
-                            <Setter TargetName="OnContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContentForegroundDisabled}" />
-                            <Setter TargetName="SwitchAreaGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContainerBackgroundDisabled}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="ContentDirection" Value="RightToLeft">
-                <Setter Property="ContentPadding" Value="12 0 0 0" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.xaml b/src/MahApps.Metro/Styles/Controls.xaml
index 2431fd7fde..a6dbfda62c 100644
--- a/src/MahApps.Metro/Styles/Controls.xaml
+++ b/src/MahApps.Metro/Styles/Controls.xaml
@@ -34,7 +34,6 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.ToolBar.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TreeView.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.StatusBar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.ToggleSwitch.xaml" />
 
         <!--  Theme styles with keys  -->
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/MetroHeader.xaml" />
@@ -44,6 +43,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/HamburgerMenu.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/RangeSlider.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/MetroProgressBar.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/ToggleSwitch.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="MahApps.Styles.ContentControl.FloatingMessageContainer" TargetType="{x:Type ContentControl}">
diff --git a/src/MahApps.Metro/Styles/Fonts.xaml b/src/MahApps.Metro/Styles/Fonts.xaml
index 11921fbf51..4e560fd63d 100644
--- a/src/MahApps.Metro/Styles/Fonts.xaml
+++ b/src/MahApps.Metro/Styles/Fonts.xaml
@@ -7,10 +7,8 @@
     <FontFamily x:Key="MahApps.Fonts.Family.Header">Segoe UI Light, Lucida Sans Unicode, Verdana</FontFamily>
     <FontFamily x:Key="MahApps.Fonts.Family.Window.Title">Segoe UI Light, Lucida Sans Unicode, Verdana</FontFamily>
     <FontFamily x:Key="MahApps.Fonts.Family.Control">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
-    <FontFamily x:Key="MahApps.Fonts.Family.ToggleSwitch">Segoe UI Semibold, Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
-    <FontFamily x:Key="MahApps.Fonts.Family.ToggleSwitch.Header">Segoe UI Semibold, Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
-    <FontFamily x:Key="MahApps.Fonts.Family.ToggleSwitch.Win10">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
-    <FontFamily x:Key="MahApps.Fonts.Family.ToggleSwitch.Header.Win10">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
+    <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>
@@ -33,9 +31,7 @@
 
     <System:Double x:Key="MahApps.Font.Size.Flyout.Header">20</System:Double>
 
-    <System:Double x:Key="MahApps.Font.Size.ToggleSwitch">14.667</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.ToggleSwitch.Header">16</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.ToggleSwitch.Win10">14</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.ToggleSwitch.Header.Win10">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/Themes/Theme.Template.xaml b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
index 3d0acf9f78..de5bb5df26 100644
--- a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
+++ b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
@@ -477,7 +477,7 @@
     <markup:StaticResource x:Key="MahApps.Brushes.RadioButton.CheckGlyphStrokePressed" ResourceKey="MahApps.Brushes.SystemControlTransparent" />
     <markup:StaticResource x:Key="MahApps.Brushes.RadioButton.CheckGlyphStrokeDisabled" ResourceKey="MahApps.Brushes.SystemControlTransparent" />
 
-    <!-- Resources for MahApps.Styles.ToggleSwitchButton.Win10 and MahApps.Styles.ToggleSwitch.Win10 -->
+    <!--  Resources for MahApps.Styles.ToggleSwitch  -->
     <markup:StaticResource x:Key="MahApps.Brushes.ToggleSwitch.ContentForeground" ResourceKey="MahApps.Brushes.SystemControlForegroundBaseHigh" />
     <markup:StaticResource x:Key="MahApps.Brushes.ToggleSwitch.ContentForegroundDisabled" ResourceKey="MahApps.Brushes.SystemControlDisabledBaseMediumLow" />
     <markup:StaticResource x:Key="MahApps.Brushes.ToggleSwitch.HeaderForeground" ResourceKey="MahApps.Brushes.SystemControlForegroundBaseHigh" />
diff --git a/src/MahApps.Metro/Themes/Generic.xaml b/src/MahApps.Metro/Themes/Generic.xaml
index 67e7a0bbca..6200504da1 100644
--- a/src/MahApps.Metro/Themes/Generic.xaml
+++ b/src/MahApps.Metro/Themes/Generic.xaml
@@ -41,7 +41,6 @@
 
     <!--  set up default styles for our custom controls  -->
 
-    <Style BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton}" TargetType="{x:Type Controls:ToggleSwitchButton}" />
     <Style BasedOn="{StaticResource MahApps.Styles.ToggleSwitch}" TargetType="{x:Type Controls:ToggleSwitch}" />
     <Style BasedOn="{StaticResource MahApps.Styles.ContentControlEx}" TargetType="{x:Type Controls:ContentControlEx}" />
     <Style BasedOn="{StaticResource MahApps.Styles.MetroThumbContentControl}" TargetType="{x:Type Controls:MetroThumbContentControl}" />
diff --git a/src/MahApps.Metro/Themes/ToggleSwitch.xaml b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
index 7a1368f383..ca82bf42e1 100644
--- a/src/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -1,261 +1,400 @@
 <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">
 
-    <Style x:Key="MahApps.Styles.ToggleSwitchButton" TargetType="{x:Type Controls:ToggleSwitchButton}">
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
-        <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="Height" Value="35" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
-        <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Padding" Value="2" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:ToggleSwitchButton}">
-                    <Grid>
-                        <Grid x:Name="PART_SwitchTrack" Margin="5">
-                            <Border Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}">
-                                <Grid Margin="{TemplateBinding Padding}" ClipToBounds="True">
-                                    <Rectangle Fill="{TemplateBinding OnSwitchBrush}" />
-                                    <Rectangle Fill="{TemplateBinding OffSwitchBrush}" RenderTransformOrigin="0.5,0.5">
-                                        <Rectangle.RenderTransform>
-                                            <TranslateTransform x:Name="PART_BackgroundTranslate" />
-                                        </Rectangle.RenderTransform>
-                                    </Rectangle>
-                                    <Rectangle x:Name="PART_BackgroundOverlay"
-                                               Fill="{DynamicResource MahApps.Brushes.ThemeBackground}"
-                                               Opacity="0" />
-                                </Grid>
-                            </Border>
-                            <Rectangle x:Name="PART_ThumbIndicator"
-                                       Width="{TemplateBinding ThumbIndicatorWidth}"
-                                       HorizontalAlignment="Left"
-                                       Fill="{TemplateBinding ThumbIndicatorBrush}">
-                                <Rectangle.RenderTransform>
-                                    <TranslateTransform x:Name="PART_ThumbTranslate" />
-                                </Rectangle.RenderTransform>
-                            </Rectangle>
-                        </Grid>
-                        <Thumb x:Name="PART_DraggingThumb" Background="Transparent">
-                            <Thumb.Template>
-                                <ControlTemplate>
-                                    <Grid Background="{TemplateBinding Background}" />
-                                </ControlTemplate>
-                            </Thumb.Template>
-                        </Thumb>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_BackgroundOverlay" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0.5" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_BackgroundOverlay" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0.2" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_BackgroundOverlay" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0.4" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_ThumbIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ThumbIndicatorDisabledBrush}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
-        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
-        <Setter Property="ThumbIndicatorWidth" Value="13" />
-        <Setter Property="Width" Value="70" />
-    </Style>
+    <GridLength x:Key="ToggleSwitchPreContentMargin">6</GridLength>
+    <GridLength x:Key="ToggleSwitchPostContentMargin">6</GridLength>
+    <GridLength x:Key="ToggleSwitchContentSpaceMargin">12</GridLength>
+
+    <Thickness x:Key="ToggleSwitchTopHeaderMargin">0 0 0 4</Thickness>
 
-    <Style x:Key="MahApps.Styles.ToggleSwitch" TargetType="{x:Type Controls:ToggleSwitch}">
-        <Setter Property="ContentPadding" Value="0 0 4 0" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.ToggleSwitch.Header}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderMargin" Value="0 0 0 5" />
+    <system:Double x:Key="ToggleSwitchOnStrokeThickness">0</system:Double>
+    <system:Double x:Key="ToggleSwitchOffStrokeThickness">2</system:Double>
+    <system:Double x:Key="ToggleSwitchThemeMinWidth">154</system:Double>
+
+    <KeyTime x:Key="ToggleSwitchTranslateDuration">0:0:0.500</KeyTime>
+
+    <Style x:Key="MahApps.Styles.ToggleSwitch" TargetType="{x:Type mah:ToggleSwitch}">
+        <Setter Property="ContentDirection" Value="RightToLeft" />
         <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}" />
-        <Setter Property="HeaderFontFamily" Value="{DynamicResource MahApps.Fonts.Family.ToggleSwitch.Header}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContentForeground}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderFontFamily" Value="{DynamicResource MahApps.Fonts.Family.ToggleSwitch.Header}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="IsTabStop" Value="True" />
-        <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
-        <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Padding" Value="0" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:ToggleSwitch}">
+                <ControlTemplate TargetType="{x:Type mah:ToggleSwitch}">
                     <Border Padding="{TemplateBinding Padding}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                        <Grid Background="Transparent">
+                        <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="firstCol" Width="*" />
-                                <ColumnDefinition x:Name="secCol" Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <ContentControl x:Name="Header"
-                                            Grid.Column="0"
-                                            Grid.ColumnSpan="2"
-                                            Margin="{TemplateBinding Controls:HeaderedControlHelper.HeaderMargin}"
-                                            Content="{TemplateBinding Header}"
-                                            ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                            ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                            FontFamily="{TemplateBinding HeaderFontFamily}"
-                                            FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
-                                            FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
-                                            IsTabStop="False" />
-                            <ContentControl x:Name="Content"
-                                            Grid.Row="1"
-                                            Grid.Column="0"
-                                            Margin="{TemplateBinding ContentPadding}"
-                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                            Content="{TemplateBinding Content}"
-                                            ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                            FontFamily="{TemplateBinding FontFamily}"
-                                            FontSize="{TemplateBinding FontSize}"
-                                            IsTabStop="False" />
-                            <ContentControl x:Name="ContentOnLabel"
-                                            Grid.Row="1"
-                                            Grid.Column="0"
-                                            Margin="{TemplateBinding ContentPadding}"
-                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                            Content="{TemplateBinding OnLabel}"
-                                            ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                            FontFamily="{TemplateBinding FontFamily}"
-                                            FontSize="{TemplateBinding FontSize}"
-                                            IsTabStop="False"
-                                            Visibility="Hidden" />
-                            <ContentControl x:Name="ContentOffLabel"
-                                            Grid.Row="1"
-                                            Grid.Column="0"
-                                            Margin="{TemplateBinding ContentPadding}"
-                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                            Content="{TemplateBinding OffLabel}"
-                                            ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                            FontFamily="{TemplateBinding FontFamily}"
-                                            FontSize="{TemplateBinding FontSize}"
-                                            IsTabStop="False"
-                                            Visibility="Hidden" />
-                            <Controls:ToggleSwitchButton x:Name="Switch"
-                                                         Grid.Row="1"
-                                                         Grid.Column="1"
-                                                         VerticalAlignment="Center"
-                                                         Background="{TemplateBinding Background}"
-                                                         FocusVisualStyle="{x:Null}"
-                                                         IsChecked="{Binding IsChecked, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                         OffSwitchBrush="{TemplateBinding OffSwitchBrush}"
-                                                         OnSwitchBrush="{TemplateBinding OnSwitchBrush}"
-                                                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                         Style="{TemplateBinding ToggleSwitchButtonStyle}"
-                                                         ThumbIndicatorBrush="{TemplateBinding ThumbIndicatorBrush}"
-                                                         ThumbIndicatorDisabledBrush="{TemplateBinding ThumbIndicatorDisabledBrush}"
-                                                         ThumbIndicatorWidth="{TemplateBinding ThumbIndicatorWidth}" />
+
+                            <ContentPresenter x:Name="HeaderContentPresenter"
+                                              Grid.Row="0"
+                                              Margin="{TemplateBinding mah:HeaderedControlHelper.HeaderMargin}"
+                                              Content="{TemplateBinding Header}"
+                                              ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                              ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                              IsHitTestVisible="False"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                              TextElement.FontFamily="{TemplateBinding mah:HeaderedControlHelper.HeaderFontFamily}"
+                                              TextElement.FontSize="{TemplateBinding mah:HeaderedControlHelper.HeaderFontSize}"
+                                              TextElement.FontWeight="{TemplateBinding mah:HeaderedControlHelper.HeaderFontWeight}"
+                                              TextElement.FontStretch="{TemplateBinding mah:HeaderedControlHelper.HeaderFontStretch}"
+                                              TextElement.Foreground="{DynamicResource MahApps.Brushes.ToggleSwitch.HeaderForeground}"
+                                              Visibility="Collapsed" />
+
+                            <Grid Grid.Row="1"
+                                  MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
+                                  HorizontalAlignment="Left"
+                                  VerticalAlignment="Top">
+
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="{DynamicResource ToggleSwitchPreContentMargin}" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="{DynamicResource ToggleSwitchPostContentMargin}" />
+                                </Grid.RowDefinitions>
+
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="{DynamicResource ToggleSwitchContentSpaceMargin}" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <Grid x:Name="SwitchAreaGrid"
+                                      Grid.RowSpan="3"
+                                      Grid.ColumnSpan="3"
+                                      Margin="0 5"
+                                      Background="{DynamicResource MahApps.Brushes.ToggleSwitch.ContainerBackground}" />
+
+                                <ContentPresenter x:Name="OffContentPresenter"
+                                                  Grid.Row="0"
+                                                  Grid.RowSpan="3"
+                                                  Grid.Column="2"
+                                                  Margin="{TemplateBinding ContentPadding}"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding OffContent}"
+                                                  ContentStringFormat="{TemplateBinding OffContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding OffContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding OffContentTemplateSelector}"
+                                                  IsHitTestVisible="False"
+                                                  Opacity="0"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                  TextElement.FontFamily="{TemplateBinding FontFamily}"
+                                                  TextElement.FontSize="{TemplateBinding FontSize}"
+                                                  TextElement.Foreground="{TemplateBinding Foreground}" />
+                                <ContentPresenter x:Name="OnContentPresenter"
+                                                  Grid.Row="0"
+                                                  Grid.RowSpan="3"
+                                                  Grid.Column="2"
+                                                  Margin="{TemplateBinding ContentPadding}"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding OnContent}"
+                                                  ContentStringFormat="{TemplateBinding OnContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding OnContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding OnContentTemplateSelector}"
+                                                  IsHitTestVisible="False"
+                                                  Opacity="0"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                  TextElement.FontFamily="{TemplateBinding FontFamily}"
+                                                  TextElement.FontSize="{TemplateBinding FontSize}"
+                                                  TextElement.Foreground="{TemplateBinding Foreground}" />
+                                <ContentPresenter x:Name="ContentPresenter"
+                                                  Grid.Row="0"
+                                                  Grid.RowSpan="3"
+                                                  Grid.Column="2"
+                                                  Margin="{TemplateBinding ContentPadding}"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                  TextElement.FontFamily="{TemplateBinding FontFamily}"
+                                                  TextElement.FontSize="{TemplateBinding FontSize}"
+                                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                                  Visibility="Collapsed" />
+
+                                <Grid x:Name="Switch"
+                                      Grid.Row="1"
+                                      Grid.Column="0"
+                                      Width="44"
+                                      Height="20"
+                                      HorizontalAlignment="Left"
+                                      SnapsToDevicePixels="False">
+                                    <Rectangle x:Name="OuterBorder"
+                                               Fill="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOff}"
+                                               RadiusX="10"
+                                               RadiusY="10"
+                                               Stroke="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOff}"
+                                               StrokeThickness="{DynamicResource ToggleSwitchOffStrokeThickness}" />
+                                    <Rectangle x:Name="SwitchKnobBounds"
+                                               Fill="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOn}"
+                                               Opacity="0"
+                                               RadiusX="10"
+                                               RadiusY="10"
+                                               Stroke="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOn}"
+                                               StrokeThickness="{DynamicResource ToggleSwitchOnStrokeThickness}" />
+                                    <Grid x:Name="SwitchKnob"
+                                          Width="20"
+                                          Height="20"
+                                          HorizontalAlignment="Left">
+                                        <Ellipse x:Name="SwitchKnobOn"
+                                                 Width="10"
+                                                 Height="10"
+                                                 Fill="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOn}"
+                                                 Opacity="0" />
+                                        <Ellipse x:Name="SwitchKnobOff"
+                                                 Width="10"
+                                                 Height="10"
+                                                 Fill="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOff}" />
+                                        <Grid.RenderTransform>
+                                            <TranslateTransform x:Name="KnobTranslateTransform" />
+                                        </Grid.RenderTransform>
+                                        <Grid.CacheMode>
+                                            <BitmapCache RenderAtScale="2" />
+                                        </Grid.CacheMode>
+                                    </Grid>
+                                </Grid>
+                                <Thumb x:Name="SwitchThumb"
+                                       Grid.Row="0"
+                                       Grid.RowSpan="3"
+                                       Grid.Column="0"
+                                       Grid.ColumnSpan="3">
+                                    <Thumb.Template>
+                                        <ControlTemplate TargetType="Thumb">
+                                            <Rectangle Fill="Transparent" />
+                                        </ControlTemplate>
+                                    </Thumb.Template>
+                                </Thumb>
+                            </Grid>
+
                         </Grid>
+
                         <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="Disabled">
+                            <VisualStateGroup x:Name="ToggleStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition x:Name="DraggingToOnTransition"
+                                                      GeneratedDuration="0"
+                                                      From="Dragging"
+                                                      To="On">
+
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="KnobTranslateTransform" Storyboard.TargetProperty="X">
+                                                <EasingDoubleKeyFrame KeyTime="{StaticResource ToggleSwitchTranslateDuration}" Value="24">
+                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                                        <ExponentialEase Exponent="9" />
+                                                    </EasingDoubleKeyFrame.EasingFunction>
+                                                </EasingDoubleKeyFrame>
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                    <VisualTransition x:Name="DraggingToOffTransition"
+                                                      GeneratedDuration="0"
+                                                      From="Dragging"
+                                                      To="Off">
+
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="KnobTranslateTransform" Storyboard.TargetProperty="X">
+                                                <EasingDoubleKeyFrame KeyTime="{StaticResource ToggleSwitchTranslateDuration}" Value="0">
+                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                                        <ExponentialEase Exponent="9" />
+                                                    </EasingDoubleKeyFrame.EasingFunction>
+                                                </EasingDoubleKeyFrame>
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                    <VisualTransition x:Name="OnToOffTransition"
+                                                      GeneratedDuration="0"
+                                                      From="On"
+                                                      To="Off">
+
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="KnobTranslateTransform" Storyboard.TargetProperty="X">
+                                                <EasingDoubleKeyFrame KeyTime="{StaticResource ToggleSwitchTranslateDuration}" Value="0">
+                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                                        <ExponentialEase Exponent="9" />
+                                                    </EasingDoubleKeyFrame.EasingFunction>
+                                                </EasingDoubleKeyFrame>
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+
+                                    <VisualTransition x:Name="OffToOnTransition"
+                                                      GeneratedDuration="0"
+                                                      From="Off"
+                                                      To="On">
+
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="KnobTranslateTransform" Storyboard.TargetProperty="X">
+                                                <EasingDoubleKeyFrame KeyTime="{StaticResource ToggleSwitchTranslateDuration}" Value="24">
+                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                                        <ExponentialEase Exponent="9" />
+                                                    </EasingDoubleKeyFrame.EasingFunction>
+                                                </EasingDoubleKeyFrame>
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+
+                                </VisualStateGroup.Transitions>
+
+                                <VisualState x:Name="Dragging" />
+                                <VisualState x:Name="Off">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="Header"
-                                                         Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                         To="0.3"
-                                                         Duration="0" />
-                                        <DoubleAnimation Storyboard.TargetName="Content"
-                                                         Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                         To="0.3"
+                                        <DoubleAnimation Storyboard.TargetName="KnobTranslateTransform"
+                                                         Storyboard.TargetProperty="X"
+                                                         To="0"
                                                          Duration="0" />
-                                        <DoubleAnimation Storyboard.TargetName="ContentOnLabel"
-                                                         Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                         To="0.3"
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="On">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="KnobTranslateTransform"
+                                                         Storyboard.TargetProperty="X"
+                                                         To="24"
                                                          Duration="0" />
-                                        <DoubleAnimation Storyboard.TargetName="ContentOffLabel"
-                                                         Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                         To="0.3"
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="ContentStates">
+                                <VisualState x:Name="OffContent">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="OffContentPresenter"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
                                                          Duration="0" />
-                                        <DoubleAnimation Storyboard.TargetName="Switch"
-                                                         Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                         To="0.75"
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OffContentPresenter" Storyboard.TargetProperty="IsHitTestVisible">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <system:Boolean>True</system:Boolean>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="OnContent">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="OnContentPresenter"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
                                                          Duration="0" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OnContentPresenter" Storyboard.TargetProperty="IsHitTestVisible">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <system:Boolean>True</system:Boolean>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
+
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </Border>
+
                     <ControlTemplate.Triggers>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsChecked" Value="True" />
-                                <Condition Property="Content" Value="{x:Null}" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentOnLabel" Property="Visibility" Value="Visible" />
-                        </MultiTrigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsChecked" Value="False" />
-                                <Condition Property="Content" Value="{x:Null}" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentOffLabel" Property="Visibility" Value="Visible" />
-                        </MultiTrigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Header}" Value="{x:Null}">
-                            <Setter TargetName="Header" Property="Visibility" Value="Collapsed" />
-                        </DataTrigger>
-                        <Trigger Property="ContentDirection" Value="RightToLeft">
-                            <Setter TargetName="Content" Property="Grid.Column" Value="1" />
-                            <Setter TargetName="ContentOffLabel" Property="Grid.Column" Value="1" />
-                            <Setter TargetName="ContentOnLabel" Property="Grid.Column" Value="1" />
-                            <Setter TargetName="Switch" Property="Grid.Column" Value="0" />
-                            <Setter TargetName="firstCol" Property="Width" Value="Auto" />
-                            <Setter TargetName="secCol" Property="Width" Value="*" />
+                        <Trigger Property="ContentDirection" Value="LeftToRight">
+                            <Setter TargetName="ContentPresenter" Property="Grid.Column" Value="0" />
+                            <Setter TargetName="OffContentPresenter" Property="Grid.Column" Value="0" />
+                            <Setter TargetName="OnContentPresenter" Property="Grid.Column" Value="0" />
+                            <Setter TargetName="Switch" Property="Grid.Column" Value="2" />
+                        </Trigger>
+
+                        <!--  MouseOver  -->
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="OuterBorder" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOffPointerOver}" />
+                            <Setter TargetName="OuterBorder" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOffPointerOver}" />
+                            <Setter TargetName="SwitchAreaGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContainerBackgroundPointerOver}" />
+                            <Setter TargetName="SwitchKnobBounds" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOnPointerOver}" />
+                            <Setter TargetName="SwitchKnobBounds" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOnPointerOver}" />
+                            <Setter TargetName="SwitchKnobOff" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOffPointerOver}" />
+                            <Setter TargetName="SwitchKnobOn" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOnPointerOver}" />
+                        </Trigger>
+
+                        <!--  Pressed  -->
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="OuterBorder" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOffPressed}" />
+                            <Setter TargetName="OuterBorder" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOffPressed}" />
+                            <Setter TargetName="OuterBorder" Property="StrokeThickness" Value="0" />
+                            <Setter TargetName="SwitchAreaGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContainerBackgroundPressed}" />
+                            <Setter TargetName="SwitchKnobBounds" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOnPressed}" />
+                            <Setter TargetName="SwitchKnobBounds" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOnPressed}" />
+                            <Setter TargetName="SwitchKnobOff" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOffPressed}" />
+                            <Setter TargetName="SwitchKnobOn" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOnPressed}" />
+                        </Trigger>
+
+                        <!--  Disabled  -->
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContentForegroundDisabled}" />
+                            <Setter TargetName="HeaderContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.HeaderForegroundDisabled}" />
+                            <Setter TargetName="OffContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContentForegroundDisabled}" />
+                            <Setter TargetName="OnContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContentForegroundDisabled}" />
+                            <Setter TargetName="OuterBorder" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOffDisabled}" />
+                            <Setter TargetName="OuterBorder" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOffDisabled}" />
+                            <Setter TargetName="SwitchAreaGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.ContainerBackgroundDisabled}" />
+                            <Setter TargetName="SwitchKnobBounds" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.FillOnDisabled}" />
+                            <Setter TargetName="SwitchKnobBounds" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.StrokeOnDisabled}" />
+                            <Setter TargetName="SwitchKnobOff" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOffDisabled}" />
+                            <Setter TargetName="SwitchKnobOn" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitch.KnobFillOnDisabled}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
-        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
-        <Setter Property="ThumbIndicatorWidth" Value="13" />
-        <Setter Property="ToggleSwitchButtonStyle" Value="{DynamicResource MahApps.Styles.ToggleSwitchButton}" />
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Style.Triggers>
-            <Trigger Property="ContentDirection" Value="RightToLeft">
-                <Setter Property="ContentPadding" Value="4 0 0 0" />
-            </Trigger>
-        </Style.Triggers>
+        <Setter Property="mah:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.ToggleSwitch.Header}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderMargin" Value="{DynamicResource ToggleSwitchTopHeaderMargin}" />
     </Style>
+
 </ResourceDictionary>