diff --git a/MahApps.Metro/Controls/ToggleSwitch.cs b/MahApps.Metro/Controls/ToggleSwitch.cs
index 17c752978b..ca87f4e8d3 100644
--- a/MahApps.Metro/Controls/ToggleSwitch.cs
+++ b/MahApps.Metro/Controls/ToggleSwitch.cs
@@ -10,6 +10,7 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
+using System.Windows.Input;
 using System.Windows.Media;
 using MahApps.Metro.Converters;
 
@@ -29,16 +30,34 @@ public class ToggleSwitch : ContentControl
         private const string SwitchPart = "Switch";
 
         private ToggleButton _toggleButton;
-        private bool _wasContentSet;
 
         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"));
         public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register("Header", typeof(object), typeof(ToggleSwitch), new PropertyMetadata(null));
         public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register("HeaderTemplate", typeof(DataTemplate), typeof(ToggleSwitch), new PropertyMetadata(null));
-        public static readonly DependencyProperty SwitchForegroundProperty = DependencyProperty.Register("SwitchForeground", typeof(Brush), typeof(ToggleSwitch), null);
+
+        [Obsolete(@"This property will be deleted in the next release. You should use OnSwitchBrush and OffSwitchBrush to change the switch's brushes.")]
+        public static readonly DependencyProperty SwitchForegroundProperty = DependencyProperty.Register("SwitchForeground", typeof(Brush), typeof(ToggleSwitch), new PropertyMetadata(null, (o, e) => ((ToggleSwitch)o).OnSwitchBrush = e.NewValue as Brush));
+        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);
+
+        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));
+
         public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register("IsChecked", typeof(bool?), typeof(ToggleSwitch), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsCheckedChanged));
+
+        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));
+
+        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));
+
         // 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));
+        public static readonly DependencyProperty ToggleSwitchButtonStyleProperty = DependencyProperty.Register("ToggleSwitchButtonStyle", typeof(Style), typeof(ToggleSwitch), new FrameworkPropertyMetadata(default(Style), FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure));
 
         public event EventHandler<RoutedEventArgs> Checked;
         public event EventHandler<RoutedEventArgs> Unchecked;
@@ -84,23 +103,76 @@ public DataTemplate HeaderTemplate
         /// <summary>
         /// Gets/sets the brush used for the switch's foreground.
         /// </summary>
+        [Obsolete(@"This property will be deleted in the next release. You should use OnSwitchBrush and OffSwitchBrush to change the switch's brushes.")]
         public Brush SwitchForeground
         {
             get { return (Brush)GetValue(SwitchForegroundProperty); }
-            set
-            {
-                SetValue(SwitchForegroundProperty, value);
-            }
+            set { SetValue(SwitchForegroundProperty, value); }
+        }
+
+        /// <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); }
         }
 
         /// <summary>
         /// Gets/sets the control's content flow direction.
         /// </summary>
-        public FlowDirection ContentDirection {
+        public FlowDirection ContentDirection
+        {
             get { return (FlowDirection)GetValue(ContentDirectionProperty); }
             set { SetValue(ContentDirectionProperty, value); }
         }
 
+        /// <summary>
+        /// Gets/sets the control's toggle switch button style.
+        /// </summary>
+        public Style ToggleSwitchButtonStyle
+        {
+            get { return (Style)GetValue(ToggleSwitchButtonStyleProperty); }
+            set { SetValue(ToggleSwitchButtonStyleProperty, value); }
+        }
+
         /// <summary>
         /// Gets/sets whether the control is Checked (On) or not (Off).
         /// </summary>
@@ -111,6 +183,60 @@ public bool? IsChecked
             set { SetValue(IsCheckedProperty, value); }
         }
 
+        /// <summary>
+        /// Gets/sets the command which will be executed if the IsChecked property was changed.
+        /// </summary>
+        public ICommand CheckChangedCommand
+        {
+            get { return (ICommand)GetValue(CheckChangedCommandProperty); }
+            set { SetValue(CheckChangedCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets/sets the command which will be executed if the checked event of the control is fired.
+        /// </summary>
+        public ICommand CheckedCommand
+        {
+            get { return (ICommand)GetValue(CheckedCommandProperty); }
+            set { SetValue(CheckedCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets/sets the command which will be executed if the checked event of the control is fired.
+        /// </summary>
+        public ICommand UnCheckedCommand
+        {
+            get { return (ICommand)GetValue(UnCheckedCommandProperty); }
+            set { SetValue(UnCheckedCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets/sets the command parameter which will be passed by the CheckChangedCommand.
+        /// </summary>
+        public object CheckChangedCommandParameter
+        {
+            get { return (object)GetValue(CheckChangedCommandParameterProperty); }
+            set { SetValue(CheckChangedCommandParameterProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets/sets the command parameter which will be passed by the CheckedCommand.
+        /// </summary>
+        public object CheckedCommandParameter
+        {
+            get { return (object)GetValue(CheckedCommandParameterProperty); }
+            set { SetValue(CheckedCommandParameterProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets/sets the command parameter which will be passed by the UnCheckedCommand.
+        /// </summary>
+        public object UnCheckedCommandParameter
+        {
+            get { return (object)GetValue(UnCheckedCommandParameterProperty); }
+            set { SetValue(UnCheckedCommandParameterProperty, value); }
+        }
+
         /// <summary>
         /// An event that is raised when the value of IsChecked changes.
         /// </summary>
@@ -124,9 +250,20 @@ private static void OnIsCheckedChanged(DependencyObject d, DependencyPropertyCha
                 var oldValue = (bool?)e.OldValue;
                 var newValue = (bool?)e.NewValue;
 
-                if (oldValue != newValue && toggleSwitch.IsCheckedChanged != null)
+                if (oldValue != newValue)
                 {
-                    toggleSwitch.IsCheckedChanged(toggleSwitch, EventArgs.Empty);
+                    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);
+                    }
                 }
             }
         }
@@ -136,18 +273,13 @@ public ToggleSwitch()
             DefaultStyleKey = typeof(ToggleSwitch);
 
             PreviewKeyUp += ToggleSwitch_PreviewKeyUp;
+            MouseUp += (sender, args) => Keyboard.Focus(this);
         }
 
         void ToggleSwitch_PreviewKeyUp(object sender, System.Windows.Input.KeyEventArgs e)
         {
             if (e.Key == System.Windows.Input.Key.Space && e.OriginalSource == sender)
-                IsChecked = !IsChecked;       
-        }
-
-        private void SetDefaultContent()
-        {
-            Binding binding = new Binding("IsChecked") { Source = this, Converter = new OffOnConverter(), ConverterParameter = this };
-            SetBinding(ContentProperty, binding);
+                IsChecked = !IsChecked;
         }
 
         private void ChangeVisualState(bool useTransitions)
@@ -155,21 +287,10 @@ private void ChangeVisualState(bool useTransitions)
             VisualStateManager.GoToState(this, IsEnabled ? NormalState : DisabledState, useTransitions);
         }
 
-        protected override void OnContentChanged(object oldContent, object newContent)
-        {
-            base.OnContentChanged(oldContent, newContent);
-            _wasContentSet = true;
-        }
-
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
 
-            if (!_wasContentSet && GetBindingExpression(ContentProperty) == null)
-            {
-                SetDefaultContent();
-            }
-
             if (_toggleButton != null)
             {
                 _toggleButton.Checked -= CheckedHandler;
@@ -179,6 +300,8 @@ public override void OnApplyTemplate()
                 BindingOperations.ClearBinding(_toggleButton, ToggleButton.IsCheckedProperty);
 
                 _toggleButton.IsEnabledChanged -= IsEnabledHandler;
+
+                _toggleButton.PreviewMouseUp -= this.ToggleButtonPreviewMouseUp;
             }
             _toggleButton = GetTemplateChild(SwitchPart) as ToggleButton;
             if (_toggleButton != null)
@@ -191,10 +314,17 @@ public override void OnApplyTemplate()
                 _toggleButton.SetBinding(ToggleButton.IsCheckedProperty, binding);
 
                 _toggleButton.IsEnabledChanged += IsEnabledHandler;
+
+                _toggleButton.PreviewMouseUp += this.ToggleButtonPreviewMouseUp;
             }
             ChangeVisualState(false);
         }
 
+        private void ToggleButtonPreviewMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Keyboard.Focus(this);
+        }
+
         private void IsEnabledHandler(object sender, DependencyPropertyChangedEventArgs e)
         {
             ChangeVisualState(false);
@@ -202,11 +332,25 @@ private void IsEnabledHandler(object sender, DependencyPropertyChangedEventArgs
 
         private void CheckedHandler(object sender, RoutedEventArgs e)
         {
+            var command = this.CheckedCommand;
+            var commandParameter = this.CheckedCommandParameter ?? this;
+            if (command != null && command.CanExecute(commandParameter))
+            {
+                command.Execute(commandParameter);
+            }
+            
             SafeRaise.Raise(Checked, this, e);
         }
 
         private void UncheckedHandler(object sender, RoutedEventArgs e)
         {
+            var command = this.UnCheckedCommand;
+            var commandParameter = this.UnCheckedCommandParameter ?? this;
+            if (command != null && command.CanExecute(commandParameter))
+            {
+                command.Execute(commandParameter);
+            }
+
             SafeRaise.Raise(Unchecked, this, e);
         }
 
diff --git a/MahApps.Metro/Controls/ToggleSwitchButton.cs b/MahApps.Metro/Controls/ToggleSwitchButton.cs
index b17e51ddf2..ded738e9c2 100644
--- a/MahApps.Metro/Controls/ToggleSwitchButton.cs
+++ b/MahApps.Metro/Controls/ToggleSwitchButton.cs
@@ -31,20 +31,68 @@ public class ToggleSwitchButton : ToggleButton
         private Rectangle _ThumbIndicator;
         private TranslateTransform _ThumbTranslate;
 
-        public static readonly DependencyProperty SwitchForegroundProperty = DependencyProperty.Register("SwitchForeground", typeof(Brush), typeof(ToggleSwitchButton), new PropertyMetadata(null));
+        [Obsolete(@"This property will be deleted in the next release. You should use OnSwitchBrush and OffSwitchBrush to change the switch's brushes.")]
+        public static readonly DependencyProperty SwitchForegroundProperty = DependencyProperty.Register("SwitchForeground", typeof(Brush), typeof(ToggleSwitchButton), new PropertyMetadata(null, (o, e) => ((ToggleSwitchButton)o).OnSwitchBrush = e.NewValue as Brush));
+        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 control's foreground.
         /// </summary>
+        [Obsolete(@"This property will be deleted in the next release. You should use OnSwitchBrush and OffSwitchBrush to change the switch's brushes.")]
         public Brush SwitchForeground
         {
-            get
-            {
-                return (Brush)GetValue(SwitchForegroundProperty);
-            }
-            set
-            {
-                SetValue(SwitchForegroundProperty, value);
-            }
+            get { return (Brush)GetValue(SwitchForegroundProperty); }
+            set { SetValue(SwitchForegroundProperty, value); }
+        }
+
+        /// <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); }
         }
 
         public ToggleSwitchButton()
@@ -73,14 +121,13 @@ private void UpdateThumb()
                 _thumbAnimation.FillBehavior = FillBehavior.Stop;
 
                 AnimationTimeline currentAnimation = _thumbAnimation;
-                _thumbAnimation.Completed += (sender, e) =>
+                _thumbAnimation.Completed += (sender, e) => {
+                    if (_thumbAnimation != null && currentAnimation == _thumbAnimation)
                     {
-                        if (_thumbAnimation != null && currentAnimation == _thumbAnimation)
-                        {
-                            _ThumbTranslate.X = destination;
-                            _thumbAnimation = null;
-                        }
-                    };
+                        _ThumbTranslate.X = destination;
+                        _thumbAnimation = null;
+                    }
+                };
                 _ThumbTranslate.BeginAnimation(TranslateTransform.XProperty, _thumbAnimation);
             }
         }
diff --git a/MahApps.Metro/Converters/OffOnConverter.cs b/MahApps.Metro/Converters/OffOnConverter.cs
index da2e12a782..fa5eb77456 100644
--- a/MahApps.Metro/Converters/OffOnConverter.cs
+++ b/MahApps.Metro/Converters/OffOnConverter.cs
@@ -6,6 +6,7 @@
 
 namespace MahApps.Metro.Converters
 {
+    [Obsolete(@"This converter will be deleted in the next release.")]
     public class OffOnConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/MahApps.Metro/Styles/Controls.Buttons.xaml b/MahApps.Metro/Styles/Controls.Buttons.xaml
index 9e494a8544..ee3ffbb234 100644
--- a/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -803,6 +803,115 @@
         </Setter>
     </Style>
 
+    <Style x:Key="ToggleSwitchButtonStyle"
+           TargetType="{x:Type Controls:ToggleSwitchButton}">
+        <Setter Property="IsTabStop"
+                Value="False" />
+        <Setter Property="OnSwitchBrush"
+                Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="OffSwitchBrush"
+                Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="ThumbIndicatorBrush"
+                Value="{DynamicResource BlackBrush}" />
+        <Setter Property="ThumbIndicatorDisabledBrush"
+                Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="ThumbIndicatorWidth"
+                Value="13" />
+        <Setter Property="BorderThickness"
+                Value="2" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="Width"
+                Value="70" />
+        <Setter Property="Padding"
+                Value="2" />
+        <Setter Property="Height"
+                Value="35" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Controls:ToggleSwitchButton}">
+                    <Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)"
+                                                                       Storyboard.TargetName="PART_BackgroundOverlay">
+                                            <DiscreteDoubleKeyFrame KeyTime="0"
+                                                                    Value="0.5" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="MouseOver">
+                                    <Storyboard>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)"
+                                                                       Storyboard.TargetName="PART_BackgroundOverlay">
+                                            <DiscreteDoubleKeyFrame KeyTime="0"
+                                                                    Value="0.2" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)"
+                                                                       Storyboard.TargetName="PART_BackgroundOverlay">
+                                            <DiscreteDoubleKeyFrame KeyTime="0"
+                                                                    Value="0.4" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Grid x:Name="PART_SwitchTrack"
+                              Margin="5">
+                            <Border BorderThickness="{TemplateBinding BorderThickness}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    Background="{TemplateBinding Background}">
+                                <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 WhiteBrush}"
+                                               Opacity="0" />
+                                </Grid>
+                            </Border>
+                            <Rectangle x:Name="PART_ThumbIndicator"
+                                       Fill="{TemplateBinding ThumbIndicatorBrush}"
+                                       Width="{TemplateBinding ThumbIndicatorWidth}"
+                                       HorizontalAlignment="Left">
+                                <Rectangle.RenderTransform>
+                                    <TranslateTransform x:Name="PART_ThumbTranslate" />
+                                </Rectangle.RenderTransform>
+                            </Rectangle>
+                        </Grid>
+                        <Thumb x:Name="PART_DraggingThumb">
+                            <Thumb.Template>
+                                <ControlTemplate>
+                                    <Rectangle Fill="Transparent" />
+                                </ControlTemplate>
+                            </Thumb.Template>
+                        </Thumb>
+                    </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>
+    </Style>
+
     <Style TargetType="{x:Type Button}"
            x:Key="SquareMetroButton">
         <Setter Property="Background"
diff --git a/MahApps.Metro/Styles/Fonts.xaml b/MahApps.Metro/Styles/Fonts.xaml
index 10544288fd..92cf53d76a 100644
--- a/MahApps.Metro/Styles/Fonts.xaml
+++ b/MahApps.Metro/Styles/Fonts.xaml
@@ -5,6 +5,8 @@
     <FontFamily x:Key="DefaultFont">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
     <FontFamily x:Key="HeaderFontFamily">Segoe UI Light, Lucida Sans Unicode, Verdana</FontFamily>
     <FontFamily x:Key="ContentFontFamily">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
+    <FontFamily x:Key="ToggleSwitchFontFamily">Segoe UI Semibold, Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
+    <FontFamily x:Key="ToggleSwitchHeaderFontFamily">Segoe UI Semibold, Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
     
     <System:Double x:Key="HeaderFontSize">40</System:Double>
     <System:Double x:Key="SubHeaderFontSize">29.333</System:Double>
@@ -26,4 +28,7 @@
 
     <System:Double x:Key="FlyoutHeaderFontSize">20</System:Double>
 
+    <System:Double x:Key="ToggleSwitchFontSize">14.667</System:Double>
+    <System:Double x:Key="ToggleSwitchHeaderFontSize">16</System:Double>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Themes/ToggleSwitch.xaml b/MahApps.Metro/Themes/ToggleSwitch.xaml
index 6fbfbaa216..d786f3dc23 100644
--- a/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -2,92 +2,21 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style TargetType="{x:Type Controls:ToggleSwitchButton}">
-        <Setter Property="IsTabStop"
-                Value="False" />
-        <Setter Property="SwitchForeground"
-                Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Width"
-                Value="70"/>
-        <Setter Property="Height"
-                Value="35"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:ToggleSwitchButton}">
-                    <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                                       Storyboard.TargetName="PART_BackgroundOverlay">
-                                            <DiscreteDoubleKeyFrame KeyTime="0"
-                                                                    Value="0.5"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.Fill)"
-                                                                       Storyboard.TargetName="PART_ThumbIndicator">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{DynamicResource GrayBrush4}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                                       Storyboard.TargetName="PART_BackgroundOverlay">
-                                            <DiscreteDoubleKeyFrame KeyTime="0"
-                                                                    Value="0.2" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                                       Storyboard.TargetName="PART_BackgroundOverlay">
-                                            <DiscreteDoubleKeyFrame KeyTime="0"
-                                                                    Value="0.4" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Grid x:Name="PART_SwitchTrack" Margin="5">
-                            <Border BorderThickness="2" BorderBrush="{DynamicResource GrayBrush4}">
-                                <Grid Margin="2" ClipToBounds="True">
-                                    <Rectangle Fill="{Binding SwitchForeground, RelativeSource={RelativeSource TemplatedParent}}"/>
-                                    <Rectangle Fill="{DynamicResource GrayBrush4}" RenderTransformOrigin="0.5,0.5">
-                                        <Rectangle.RenderTransform>
-                                            <TranslateTransform x:Name="PART_BackgroundTranslate"/>
-                                        </Rectangle.RenderTransform>
-                                    </Rectangle>
-                                    <Rectangle x:Name="PART_BackgroundOverlay" Fill="{DynamicResource WhiteBrush}" Opacity="0"/>
-                                </Grid>
-                            </Border>
-                            <Rectangle x:Name="PART_ThumbIndicator" Fill="{DynamicResource BlackBrush}" Width="13" HorizontalAlignment="Left">
-                                <Rectangle.RenderTransform>
-                                    <TranslateTransform x:Name="PART_ThumbTranslate"/>
-                                </Rectangle.RenderTransform>
-                            </Rectangle>
-                        </Grid>
-                        <Thumb x:Name="PART_DraggingThumb">
-                            <Thumb.Template>
-                                <ControlTemplate>
-                                    <Rectangle Fill="Transparent"/>
-                                </ControlTemplate>
-                            </Thumb.Template>
-                        </Thumb>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
     <Style TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="IsTabStop"
                 Value="True" />
-        <Setter Property="SwitchForeground"
+        <Setter Property="ToggleSwitchButtonStyle"
+                Value="{DynamicResource ToggleSwitchButtonStyle}" />
+        <Setter Property="OnSwitchBrush"
                 Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="OffSwitchBrush"
+                Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="ThumbIndicatorBrush"
+                Value="{DynamicResource BlackBrush}" />
+        <Setter Property="ThumbIndicatorDisabledBrush"
+                Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="ThumbIndicatorWidth"
+                Value="13" />
         <Setter Property="HorizontalContentAlignment"
                 Value="Left" />
         <Setter Property="VerticalContentAlignment"
@@ -95,9 +24,13 @@
         <Setter Property="Foreground"
                 Value="{DynamicResource BlackBrush}" />
         <Setter Property="FontFamily"
-                Value="Segoe UI Semibold" />
+                Value="{DynamicResource ToggleSwitchFontFamily}" />
         <Setter Property="FontSize"
-                Value="14.667" />
+                Value="{DynamicResource ToggleSwitchFontSize}" />
+        <Setter Property="SnapsToDevicePixels"
+                Value="True" />
+        <Setter Property="Validation.ErrorTemplate"
+                Value="{DynamicResource ValidationErrorTemplate}" />
         <Setter Property="HeaderTemplate">
             <Setter.Value>
                 <DataTemplate>
@@ -108,7 +41,8 @@
                                VerticalAlignment="Top"
                                Margin="0,0,0,5"
                                Opacity="0.65"
-                               FontSize="16" />
+                               FontFamily="{DynamicResource ToggleSwitchHeaderFontFamily}"
+                               FontSize="{DynamicResource ToggleSwitchHeaderFontSize}" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
@@ -139,7 +73,7 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Grid>
+                        <Grid Background="Transparent">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="Auto" />
@@ -167,13 +101,42 @@
                             <Controls:ToggleSwitchButton x:Name="Switch"
                                                          Grid.Column="1"
                                                          Grid.Row="1"
+                                                         FocusVisualStyle="{x:Null}"
+                                                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                         Style="{TemplateBinding ToggleSwitchButtonStyle}"
                                                          Background="{TemplateBinding Background}"
                                                          IsChecked="{Binding IsChecked, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                         SwitchForeground="{TemplateBinding SwitchForeground}"
+                                                         OnSwitchBrush="{TemplateBinding OnSwitchBrush}"
+                                                         OffSwitchBrush="{TemplateBinding OffSwitchBrush}"
+                                                         ThumbIndicatorBrush="{TemplateBinding ThumbIndicatorBrush}"
+                                                         ThumbIndicatorDisabledBrush="{TemplateBinding ThumbIndicatorDisabledBrush}"
+                                                         ThumbIndicatorWidth="{TemplateBinding ThumbIndicatorWidth}"
                                                          VerticalAlignment="Center" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsChecked" Value="True" />
+                                <Condition Property="Content" Value="{x:Null}" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="Content" Property="Content">
+                                <Setter.Value>
+                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="OnLabel" Mode="TwoWay" />
+                                </Setter.Value>
+                            </Setter>
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsChecked" Value="False" />
+                                <Condition Property="Content" Value="{x:Null}" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="Content" Property="Content">
+                                <Setter.Value>
+                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="OffLabel" Mode="TwoWay" />
+                                </Setter.Value>
+                            </Setter>
+                        </MultiTrigger>
                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Header}"
                                      Value="{x:Null}">
                             <Setter TargetName="Header"