From 9aa9639154dce852dd20efe0bf1c8f3961db2177 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Tue, 8 Mar 2016 22:07:19 +0100
Subject: [PATCH 01/10] respect _ThumbIndicator Margin Left and Right for
 transition

---
 MahApps.Metro/Controls/ToggleSwitchButton.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MahApps.Metro/Controls/ToggleSwitchButton.cs b/MahApps.Metro/Controls/ToggleSwitchButton.cs
index 474564ccd7..5727d864f6 100644
--- a/MahApps.Metro/Controls/ToggleSwitchButton.cs
+++ b/MahApps.Metro/Controls/ToggleSwitchButton.cs
@@ -112,7 +112,7 @@ private void UpdateThumb()
         {
             if (_ThumbTranslate != null && _SwitchTrack != null && _ThumbIndicator != null)
             {
-                double destination = IsChecked.GetValueOrDefault() ? ActualWidth - (_SwitchTrack.Margin.Left + _SwitchTrack.Margin.Right + _ThumbIndicator.ActualWidth) : 0;
+                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;
@@ -172,7 +172,7 @@ void _DraggingThumb_DragStarted(object sender, DragStartedEventArgs e)
             if (_ThumbTranslate != null)
             {
                 _ThumbTranslate.BeginAnimation(TranslateTransform.XProperty, null);
-                double destination = IsChecked.GetValueOrDefault() ? ActualWidth - (_SwitchTrack.Margin.Left + _SwitchTrack.Margin.Right + _ThumbIndicator.ActualWidth) : 0;
+                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;
             }
@@ -189,7 +189,7 @@ void _DraggingThumb_DragDelta(object sender, DragDeltaEventArgs e)
                 if (_SwitchTrack != null && _ThumbIndicator != null)
                 {
                     double lastDragPosition = _lastDragPosition.Value;
-                    _ThumbTranslate.X = Math.Min(ActualWidth - (_SwitchTrack.Margin.Left + _SwitchTrack.Margin.Right + _ThumbIndicator.ActualWidth), Math.Max(0, lastDragPosition + e.HorizontalChange));
+                    _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));
                 }
             }
         }
@@ -219,7 +219,7 @@ 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) : 0;
+                double destination = IsChecked.GetValueOrDefault() ? ActualWidth - (_SwitchTrack.Margin.Left + _SwitchTrack.Margin.Right + _ThumbIndicator.ActualWidth + _ThumbIndicator.Margin.Left + _ThumbIndicator.Margin.Right) : 0;
                 _ThumbTranslate.X = destination;
             }
         }

From 5ee11188e49e90484b24c8c01d7cb266733b636e Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Tue, 8 Mar 2016 23:49:43 +0100
Subject: [PATCH 02/10] new Controls.ToggleSwitch.xaml resource dictionary new
 MahApps.Metro.Styles.ToggleSwitchButton.Win10 and
 MahApps.Metro.Styles.ToggleSwitch.Win10

---
 MahApps.Metro/MahApps.Metro.NET45.csproj      |   5 +
 MahApps.Metro/MahApps.Metro.csproj            |   5 +
 .../Styles/Controls.ToggleSwitch.xaml         | 162 ++++++++++++++++++
 MahApps.Metro/Styles/Controls.xaml            |   9 +-
 4 files changed, 174 insertions(+), 7 deletions(-)
 create mode 100644 MahApps.Metro/Styles/Controls.ToggleSwitch.xaml

diff --git a/MahApps.Metro/MahApps.Metro.NET45.csproj b/MahApps.Metro/MahApps.Metro.NET45.csproj
index cce2864a0d..25be126f05 100644
--- a/MahApps.Metro/MahApps.Metro.NET45.csproj
+++ b/MahApps.Metro/MahApps.Metro.NET45.csproj
@@ -500,6 +500,11 @@
       <Generator>MSBuild:Compile</Generator>
       <DependentUpon>Controls.xaml</DependentUpon>
     </Page>
+    <Page Include="Styles\Controls.ToggleSwitch.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <DependentUpon>Controls.xaml</DependentUpon>
+    </Page>
     <Page Include="Styles\Controls.Toolbar.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/MahApps.Metro/MahApps.Metro.csproj b/MahApps.Metro/MahApps.Metro.csproj
index 03ad7556e6..4574c6f884 100644
--- a/MahApps.Metro/MahApps.Metro.csproj
+++ b/MahApps.Metro/MahApps.Metro.csproj
@@ -451,6 +451,11 @@
       <Generator>MSBuild:Compile</Generator>
       <DependentUpon>Controls.xaml</DependentUpon>
     </Page>
+    <Page Include="Styles\Controls.ToggleSwitch.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <DependentUpon>Controls.xaml</DependentUpon>
+    </Page>
     <Page Include="Styles\Controls.Toolbar.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
new file mode 100644
index 0000000000..7337683d68
--- /dev/null
+++ b/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -0,0 +1,162 @@
+<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">
+
+    <Style x:Key="MetroToggleSwitchButton"
+           BasedOn="{StaticResource {x:Type Controls:ToggleSwitchButton}}"
+           TargetType="{x:Type Controls:ToggleSwitchButton}" />
+
+    <Style x:Key="MetroToggleSwitch"
+           BasedOn="{StaticResource {x:Type Controls:ToggleSwitch}}"
+           TargetType="{x:Type Controls:ToggleSwitch}" />
+
+    <Style x:Key="MahApps.Metro.Styles.ToggleSwitchButton.Win10"
+           BasedOn="{StaticResource {x:Type Controls:ToggleSwitchButton}}"
+           TargetType="{x:Type Controls:ToggleSwitchButton}">
+        <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="Height" Value="20" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="OffSwitchBrush" Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="OnSwitchBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="Padding" Value="2" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Controls:ToggleSwitchButton}">
+                    <Grid>
+                        <Grid x:Name="PART_SwitchTrack"
+                              SnapsToDevicePixels="True"
+                              UseLayoutRounding="False">
+                            <Border Background="Gray"
+                                    BorderThickness="0"
+                                    CornerRadius="10"
+                                    SnapsToDevicePixels="False">
+                                <Grid>
+                                    <Border x:Name="PART_SwitchBrushBorder"
+                                            Margin="2"
+                                            Background="White"
+                                            BorderThickness="0"
+                                            CornerRadius="8"
+                                            SnapsToDevicePixels="False" />
+                                    <Ellipse x:Name="PART_ThumbIndicator"
+                                             Width="10"
+                                             Height="10"
+                                             Margin="5 0"
+                                             HorizontalAlignment="Left"
+                                             Fill="Black"
+                                             Stroke="Transparent"
+                                             StrokeThickness="0">
+                                        <Ellipse.RenderTransform>
+                                            <TranslateTransform x:Name="PART_ThumbTranslate" />
+                                        </Ellipse.RenderTransform>
+                                    </Ellipse>
+                                </Grid>
+                            </Border>
+                            <!--  <Border Background="Transparent"  -->
+                            <!--  BorderThickness="0"  -->
+                            <!--  CornerRadius="10"  -->
+                            <!--  ClipToBounds="True"  -->
+                            <!--  SnapsToDevicePixels="False">  -->
+                            <!--  <Ellipse x:Name="PART_ThumbIndicator"  -->
+                            <!--  Width="10"  -->
+                            <!--  Height="10"  -->
+                            <!--  Margin="0"  -->
+                            <!--  HorizontalAlignment="Left"  -->
+                            <!--  Fill="Black"  -->
+                            <!--  Stroke="Transparent"  -->
+                            <!--  StrokeThickness="0">  -->
+                            <!--                                    <Ellipse.RenderTransform>-->
+                            <!--                                        <TranslateTransform x:Name="PART_ThumbTranslate" />-->
+                            <!--                                    </Ellipse.RenderTransform>-->
+                            <!--                                </Ellipse>-->
+                            <!--                            </Border>-->
+                            <Border x:Name="PART_BackgroundOverlay"
+                                    Background="{DynamicResource WhiteBrush}"
+                                    BorderThickness="0"
+                                    Opacity="0"
+                                    CornerRadius="10"
+                                    SnapsToDevicePixels="False" />
+
+                            <!--  <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 WhiteBrush}"  -->
+                            <!--  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">
+                            <Thumb.Template>
+                                <ControlTemplate>
+                                    <Rectangle Fill="Transparent" />
+                                </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="IsChecked" Value="True">
+                            <Setter TargetName="PART_SwitchBrushBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OnSwitchBrush, Mode=OneWay}" />
+                            <Setter TargetName="PART_ThumbIndicator" Property="Fill" Value="White" />
+                        </Trigger>
+                        <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 BlackBrush}" />
+        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="ThumbIndicatorWidth" Value="13" />
+        <Setter Property="Width" Value="50" />
+    </Style>
+
+    <Style x:Key="MahApps.Metro.Styles.ToggleSwitch.Win10"
+           BasedOn="{StaticResource {x:Type Controls:ToggleSwitch}}"
+           TargetType="{x:Type Controls:ToggleSwitch}">
+        <Setter Property="ToggleSwitchButtonStyle" Value="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton.Win10}" />
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Controls.xaml b/MahApps.Metro/Styles/Controls.xaml
index 69204e58a6..ff77f4d7fd 100644
--- a/MahApps.Metro/Styles/Controls.xaml
+++ b/MahApps.Metro/Styles/Controls.xaml
@@ -32,6 +32,8 @@
         <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" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="FloatingMessageContainerStyle" TargetType="{x:Type ContentControl}">
@@ -43,13 +45,6 @@
         <Setter Property="Visibility" Value="Visible" />
     </Style>
 
-    <Style x:Key="MetroToggleSwitchButton"
-           BasedOn="{StaticResource {x:Type Controls:ToggleSwitchButton}}"
-           TargetType="{x:Type Controls:ToggleSwitchButton}" />
-    <Style x:Key="MetroToggleSwitch"
-           BasedOn="{StaticResource {x:Type Controls:ToggleSwitch}}"
-           TargetType="{x:Type Controls:ToggleSwitch}" />
-
     <!--  note: default style for textblock is now in MetroWindow !!!  -->
 
     <Style BasedOn="{StaticResource MetroValidationPopup}" TargetType="{x:Type Controls:CustomValidationPopup}" />

From a61da62249f9b51c904b7148c0e5a91313a7050f Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Wed, 9 Mar 2016 12:41:02 +0100
Subject: [PATCH 03/10] minor

---
 .../Styles/Controls.ToggleSwitch.xaml         | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
index 7337683d68..9e0e049b93 100644
--- a/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ b/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -1,6 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
+    
+    <!--  Metro style  -->
 
     <Style x:Key="MetroToggleSwitchButton"
            BasedOn="{StaticResource {x:Type Controls:ToggleSwitchButton}}"
@@ -10,16 +12,22 @@
            BasedOn="{StaticResource {x:Type Controls:ToggleSwitch}}"
            TargetType="{x:Type Controls:ToggleSwitch}" />
 
+    <!--  Win10 style  -->
+
     <Style x:Key="MahApps.Metro.Styles.ToggleSwitchButton.Win10"
-           BasedOn="{StaticResource {x:Type Controls:ToggleSwitchButton}}"
+           BasedOn="{StaticResource MetroToggleSwitchButton}"
            TargetType="{x:Type Controls:ToggleSwitchButton}">
+        <Setter Property="Width" Value="50" />
+        <Setter Property="Height" Value="20" />
         <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush4}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="Height" Value="20" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="OffSwitchBrush" Value="{DynamicResource GrayBrush4}" />
         <Setter Property="OnSwitchBrush" Value="{DynamicResource AccentColorBrush}" />
         <Setter Property="Padding" Value="2" />
+        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="ThumbIndicatorWidth" Value="10" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Controls:ToggleSwitchButton}">
@@ -126,11 +134,11 @@
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_BackgroundOverlay" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0.4" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
+<!--                                    <Storyboard>-->
+<!--                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_BackgroundOverlay" Storyboard.TargetProperty="(UIElement.Opacity)">-->
+<!--                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0.4" />-->
+<!--                                        </DoubleAnimationUsingKeyFrames>-->
+<!--                                    </Storyboard>-->
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
@@ -147,14 +155,10 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource BlackBrush}" />
-        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource GrayBrush4}" />
-        <Setter Property="ThumbIndicatorWidth" Value="13" />
-        <Setter Property="Width" Value="50" />
     </Style>
 
     <Style x:Key="MahApps.Metro.Styles.ToggleSwitch.Win10"
-           BasedOn="{StaticResource {x:Type Controls:ToggleSwitch}}"
+           BasedOn="{StaticResource MetroToggleSwitch}"
            TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="ToggleSwitchButtonStyle" Value="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton.Win10}" />
     </Style>

From 8baac58d37aefc7db5eab9cf14907b177cf04328 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 10 Mar 2016 00:44:48 +0100
Subject: [PATCH 04/10] more win10 like

---
 .../Styles/Controls.ToggleSwitch.xaml         | 61 ++++++++-----------
 1 file changed, 24 insertions(+), 37 deletions(-)

diff --git a/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
index 9e0e049b93..c09527efed 100644
--- a/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ b/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -19,12 +19,12 @@
            TargetType="{x:Type Controls:ToggleSwitchButton}">
         <Setter Property="Width" Value="50" />
         <Setter Property="Height" Value="20" />
-        <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush4}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="OffSwitchBrush" Value="{DynamicResource GrayBrush4}" />
-        <Setter Property="OnSwitchBrush" Value="{DynamicResource AccentColorBrush}" />
         <Setter Property="Padding" Value="2" />
+        <Setter Property="BorderBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="OffSwitchBrush" Value="{DynamicResource WhiteBrush}" />
+        <Setter Property="OnSwitchBrush" Value="{DynamicResource AccentColorBrush}" />
         <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource BlackBrush}" />
         <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource GrayBrush4}" />
         <Setter Property="ThumbIndicatorWidth" Value="10" />
@@ -35,23 +35,23 @@
                         <Grid x:Name="PART_SwitchTrack"
                               SnapsToDevicePixels="True"
                               UseLayoutRounding="False">
-                            <Border Background="Gray"
+                            <Border Background="{TemplateBinding BorderBrush}"
                                     BorderThickness="0"
                                     CornerRadius="10"
                                     SnapsToDevicePixels="False">
                                 <Grid>
                                     <Border x:Name="PART_SwitchBrushBorder"
-                                            Margin="2"
-                                            Background="White"
+                                            Margin="{TemplateBinding BorderThickness}"
+                                            Background="{TemplateBinding OffSwitchBrush}"
                                             BorderThickness="0"
                                             CornerRadius="8"
                                             SnapsToDevicePixels="False" />
                                     <Ellipse x:Name="PART_ThumbIndicator"
-                                             Width="10"
-                                             Height="10"
+                                             Width="{TemplateBinding ThumbIndicatorWidth}"
+                                             Height="{TemplateBinding ThumbIndicatorWidth}"
                                              Margin="5 0"
                                              HorizontalAlignment="Left"
-                                             Fill="Black"
+                                             Fill="{TemplateBinding ThumbIndicatorBrush}"
                                              Stroke="Transparent"
                                              StrokeThickness="0">
                                         <Ellipse.RenderTransform>
@@ -60,31 +60,12 @@
                                     </Ellipse>
                                 </Grid>
                             </Border>
-                            <!--  <Border Background="Transparent"  -->
-                            <!--  BorderThickness="0"  -->
-                            <!--  CornerRadius="10"  -->
-                            <!--  ClipToBounds="True"  -->
-                            <!--  SnapsToDevicePixels="False">  -->
-                            <!--  <Ellipse x:Name="PART_ThumbIndicator"  -->
-                            <!--  Width="10"  -->
-                            <!--  Height="10"  -->
-                            <!--  Margin="0"  -->
-                            <!--  HorizontalAlignment="Left"  -->
-                            <!--  Fill="Black"  -->
-                            <!--  Stroke="Transparent"  -->
-                            <!--  StrokeThickness="0">  -->
-                            <!--                                    <Ellipse.RenderTransform>-->
-                            <!--                                        <TranslateTransform x:Name="PART_ThumbTranslate" />-->
-                            <!--                                    </Ellipse.RenderTransform>-->
-                            <!--                                </Ellipse>-->
-                            <!--                            </Border>-->
                             <Border x:Name="PART_BackgroundOverlay"
                                     Background="{DynamicResource WhiteBrush}"
                                     BorderThickness="0"
                                     Opacity="0"
                                     CornerRadius="10"
                                     SnapsToDevicePixels="False" />
-
                             <!--  <Border Background="{TemplateBinding Background}"  -->
                             <!--  BorderBrush="{TemplateBinding BorderBrush}"  -->
                             <!--  BorderThickness="{TemplateBinding BorderThickness}">  -->
@@ -134,19 +115,20 @@
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Pressed">
-<!--                                    <Storyboard>-->
-<!--                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_BackgroundOverlay" Storyboard.TargetProperty="(UIElement.Opacity)">-->
-<!--                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0.4" />-->
-<!--                                        </DoubleAnimationUsingKeyFrames>-->
-<!--                                    </Storyboard>-->
+                                    <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="IsChecked" Value="True">
-                            <Setter TargetName="PART_SwitchBrushBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OnSwitchBrush, Mode=OneWay}" />
-                            <Setter TargetName="PART_ThumbIndicator" Property="Fill" Value="White" />
+                        <Trigger Property="ToggleButton.IsChecked" Value="True">
+                            <Setter Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OnSwitchBrush, Mode=OneWay}" />
+                            <Setter TargetName="PART_SwitchBrushBorder" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_ThumbIndicator" Property="Fill" Value="{DynamicResource WhiteBrush}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="PART_ThumbIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ThumbIndicatorDisabledBrush}" />
@@ -160,7 +142,12 @@
     <Style x:Key="MahApps.Metro.Styles.ToggleSwitch.Win10"
            BasedOn="{StaticResource MetroToggleSwitch}"
            TargetType="{x:Type Controls:ToggleSwitch}">
+        <Setter Property="OffSwitchBrush" Value="{DynamicResource WhiteBrush}" />
+        <Setter Property="OnSwitchBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="ThumbIndicatorWidth" Value="10" />
         <Setter Property="ToggleSwitchButtonStyle" Value="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton.Win10}" />
     </Style>
-
+    
 </ResourceDictionary>
\ No newline at end of file

From 3215680554ef9464e82f146c9c1148cd4fefac7d Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 10 Mar 2016 09:32:51 +0100
Subject: [PATCH 05/10] fix IsPressed state since we use a Thumb

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

diff --git a/MahApps.Metro/Controls/ToggleSwitchButton.cs b/MahApps.Metro/Controls/ToggleSwitchButton.cs
index c097740eab..99945203fd 100644
--- a/MahApps.Metro/Controls/ToggleSwitchButton.cs
+++ b/MahApps.Metro/Controls/ToggleSwitchButton.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Input;
 using System.Windows.Shapes;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
@@ -166,10 +168,24 @@ public override void OnApplyTemplate()
             }
         }
 
+        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);
@@ -197,6 +213,7 @@ void _DraggingThumb_DragDelta(object sender, DragDeltaEventArgs e)
 
         void _DraggingThumb_DragCompleted(object sender, DragCompletedEventArgs e)
         {
+            SetIsPressed(false);
             _lastDragPosition = null;
             if (!_isDragging)
             {

From ad7807725128345a6305215ae5e74bb5a8824bf5 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 10 Mar 2016 16:20:48 +0100
Subject: [PATCH 06/10] PART_ThumbIndicator should be a FrameworkElement

---
 MahApps.Metro/Controls/ToggleSwitchButton.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/MahApps.Metro/Controls/ToggleSwitchButton.cs b/MahApps.Metro/Controls/ToggleSwitchButton.cs
index 99945203fd..1ed6192bb0 100644
--- a/MahApps.Metro/Controls/ToggleSwitchButton.cs
+++ b/MahApps.Metro/Controls/ToggleSwitchButton.cs
@@ -4,7 +4,6 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using System.Windows.Shapes;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Data;
@@ -17,7 +16,7 @@ namespace MahApps.Metro.Controls
     [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(Shape))]
+    [TemplatePart(Name = PART_ThumbIndicator, Type = typeof(FrameworkElement))]
     [TemplatePart(Name = PART_ThumbTranslate, Type = typeof(TranslateTransform))]
     public class ToggleSwitchButton : ToggleButton
     {
@@ -30,7 +29,7 @@ public class ToggleSwitchButton : ToggleButton
         private TranslateTransform _BackgroundTranslate;
         private Thumb _DraggingThumb;
         private Grid _SwitchTrack;
-        private Shape _ThumbIndicator;
+        private FrameworkElement _ThumbIndicator;
         private TranslateTransform _ThumbTranslate;
         private readonly PropertyChangeNotifier isCheckedPropertyChangeNotifier;
 
@@ -141,7 +140,7 @@ public override void OnApplyTemplate()
             _BackgroundTranslate = GetTemplateChild(PART_BackgroundTranslate) as TranslateTransform;
             _DraggingThumb = GetTemplateChild(PART_DraggingThumb) as Thumb;
             _SwitchTrack = GetTemplateChild(PART_SwitchTrack) as Grid;
-            _ThumbIndicator = GetTemplateChild(PART_ThumbIndicator) as Shape;
+            _ThumbIndicator = GetTemplateChild(PART_ThumbIndicator) as FrameworkElement;
             _ThumbTranslate = GetTemplateChild(PART_ThumbTranslate) as TranslateTransform;
 
             if (_ThumbIndicator != null && _ThumbTranslate != null && _BackgroundTranslate != null)

From b7aaf0311d4ca561e869eac2e96f7a27876418cc Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 10 Mar 2016 16:21:47 +0100
Subject: [PATCH 07/10] Win10 toggle switch style finished

---
 MahApps.Metro/Styles/Accents/Amber.xaml       |  11 +-
 MahApps.Metro/Styles/Accents/BaseDark.xaml    |  11 +
 MahApps.Metro/Styles/Accents/BaseLight.xaml   |  11 +
 MahApps.Metro/Styles/Accents/Blue.xaml        |  11 +-
 MahApps.Metro/Styles/Accents/Brown.xaml       |   8 +
 MahApps.Metro/Styles/Accents/Cobalt.xaml      |   7 +
 MahApps.Metro/Styles/Accents/Crimson.xaml     |   7 +
 MahApps.Metro/Styles/Accents/Cyan.xaml        |   7 +
 MahApps.Metro/Styles/Accents/Emerald.xaml     |   7 +
 MahApps.Metro/Styles/Accents/Green.xaml       |   7 +
 MahApps.Metro/Styles/Accents/Indigo.xaml      |   7 +
 MahApps.Metro/Styles/Accents/Lime.xaml        |   7 +
 MahApps.Metro/Styles/Accents/Magenta.xaml     |   7 +
 MahApps.Metro/Styles/Accents/Mauve.xaml       |   7 +
 MahApps.Metro/Styles/Accents/Olive.xaml       |   7 +
 MahApps.Metro/Styles/Accents/Orange.xaml      |   7 +
 MahApps.Metro/Styles/Accents/Pink.xaml        |   7 +
 MahApps.Metro/Styles/Accents/Purple.xaml      |   7 +
 MahApps.Metro/Styles/Accents/Red.xaml         |   7 +
 MahApps.Metro/Styles/Accents/Sienna.xaml      |   7 +
 MahApps.Metro/Styles/Accents/Steel.xaml       |   7 +
 MahApps.Metro/Styles/Accents/Taupe.xaml       |   7 +
 MahApps.Metro/Styles/Accents/Teal.xaml        |   7 +
 MahApps.Metro/Styles/Accents/Violet.xaml      |   7 +
 MahApps.Metro/Styles/Accents/Yellow.xaml      |   7 +
 MahApps.Metro/Styles/Colors.xaml              |  17 ++
 .../Styles/Controls.ToggleSwitch.xaml         | 193 +++++++++---------
 MahApps.Metro/Themes/ToggleSwitch.xaml        |   1 +
 .../ExampleViews/ButtonsExample.xaml          |  16 +-
 29 files changed, 319 insertions(+), 100 deletions(-)

diff --git a/MahApps.Metro/Styles/Accents/Amber.xaml b/MahApps.Metro/Styles/Accents/Amber.xaml
index 66f2522867..0c8f44dd47 100644
--- a/MahApps.Metro/Styles/Accents/Amber.xaml
+++ b/MahApps.Metro/Styles/Accents/Amber.xaml
@@ -3,8 +3,11 @@
                     xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     mc:Ignorable="options">
+
     <Color x:Key="HighlightColor">#FFB17807</Color>
-    
+
+    <Color x:Key="AccentBaseColor">#FFF0A30A</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CCF0A30A</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99F0A30A</Color>
@@ -13,7 +16,9 @@
     <!--20%-->
     <Color x:Key="AccentColor4">#33F0A30A</Color>
 
+    <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -41,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/BaseDark.xaml b/MahApps.Metro/Styles/Accents/BaseDark.xaml
index 24f208f192..916e128489 100644
--- a/MahApps.Metro/Styles/Accents/BaseDark.xaml
+++ b/MahApps.Metro/Styles/Accents/BaseDark.xaml
@@ -85,4 +85,15 @@
 
     <!-- DataGrid brushes -->
     <SolidColorBrush x:Key="MetroDataGrid.DisabledHighlightBrush" Color="{StaticResource Gray7}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10" Color="#FF999999" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10" Color="#FFCCCCCC" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffMouseOverBorderBrush.Win10" Color="#FFFFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffDisabledBorderBrush.Win10" Color="#FF666666" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchDisabledBrush.Win10" Color="#FF444444" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10" Color="#FFCCCCCC" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOverBrush.Win10" Color="#FFFFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorPressedBrush.Win10" Color="#FFFFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10" Color="#FF666666" options:Freeze="True" />
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/BaseLight.xaml b/MahApps.Metro/Styles/Accents/BaseLight.xaml
index 933302e2e8..6c2455bc77 100644
--- a/MahApps.Metro/Styles/Accents/BaseLight.xaml
+++ b/MahApps.Metro/Styles/Accents/BaseLight.xaml
@@ -85,4 +85,15 @@
 
     <!-- DataGrid brushes -->
     <SolidColorBrush x:Key="MetroDataGrid.DisabledHighlightBrush" Color="{StaticResource Gray7}" options:Freeze="True" />
+    
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10" Color="#FF666666" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10" Color="#FF333333" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffMouseOverBorderBrush.Win10" Color="#FF000000" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffDisabledBorderBrush.Win10" Color="#FF999999" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchDisabledBrush.Win10" Color="#FFCCCCCC" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10" Color="#FF333333" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOverBrush.Win10" Color="#FF000000" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorPressedBrush.Win10" Color="#FFFFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10" Color="#FF999999" options:Freeze="True" />
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Blue.xaml b/MahApps.Metro/Styles/Accents/Blue.xaml
index d1864ffdb0..2feaed5d34 100644
--- a/MahApps.Metro/Styles/Accents/Blue.xaml
+++ b/MahApps.Metro/Styles/Accents/Blue.xaml
@@ -3,9 +3,10 @@
                     xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     mc:Ignorable="options">
-    <!--ACCENT COLORS-->
+
     <Color x:Key="HighlightColor">#FF086F9E</Color>
-        
+
+    <Color x:Key="AccentBaseColor">#FF119EDA</Color>
     <!--80%-->
     <Color x:Key="AccentColor">#CC119EDA</Color>
     <!--60%-->
@@ -15,7 +16,9 @@
     <!--20%-->
     <Color x:Key="AccentColor4">#33119EDA</Color>
 
+    <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Brown.xaml b/MahApps.Metro/Styles/Accents/Brown.xaml
index 89ca0b8b00..484d26a62b 100644
--- a/MahApps.Metro/Styles/Accents/Brown.xaml
+++ b/MahApps.Metro/Styles/Accents/Brown.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF604220</Color>
     
+    <Color x:Key="AccentBaseColor">#FF825A2C</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CC825A2C</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99825A2C</Color>
@@ -14,7 +16,9 @@
     <!--20%-->
     <Color x:Key="AccentColor4">#33825A2C</Color>
 
+    <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -42,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Cobalt.xaml b/MahApps.Metro/Styles/Accents/Cobalt.xaml
index 11ff5ef763..0e18ed17c4 100644
--- a/MahApps.Metro/Styles/Accents/Cobalt.xaml
+++ b/MahApps.Metro/Styles/Accents/Cobalt.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF003BB0</Color>
     
+    <Color x:Key="AccentBaseColor">#FF0050EF</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CC0050EF</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#990050EF</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Crimson.xaml b/MahApps.Metro/Styles/Accents/Crimson.xaml
index 4be2c5b2a5..ab46266e19 100644
--- a/MahApps.Metro/Styles/Accents/Crimson.xaml
+++ b/MahApps.Metro/Styles/Accents/Crimson.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF77001B</Color>
     
+    <Color x:Key="AccentBaseColor">#FFA20025</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CCA20025</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99A20025</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Cyan.xaml b/MahApps.Metro/Styles/Accents/Cyan.xaml
index 526f36e36f..18661f8140 100644
--- a/MahApps.Metro/Styles/Accents/Cyan.xaml
+++ b/MahApps.Metro/Styles/Accents/Cyan.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF1377A7</Color>
     
+    <Color x:Key="AccentBaseColor">#FF1BA1E2</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CC1BA1E2</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#991BA1E2</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Emerald.xaml b/MahApps.Metro/Styles/Accents/Emerald.xaml
index 35f469d073..9bfbfee27b 100644
--- a/MahApps.Metro/Styles/Accents/Emerald.xaml
+++ b/MahApps.Metro/Styles/Accents/Emerald.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF006600</Color>
     
+    <Color x:Key="AccentBaseColor">#FF008A00</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CC008A00</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99008A00</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Green.xaml b/MahApps.Metro/Styles/Accents/Green.xaml
index 88aad87e21..27a58c2f0f 100644
--- a/MahApps.Metro/Styles/Accents/Green.xaml
+++ b/MahApps.Metro/Styles/Accents/Green.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF477D11</Color>
     
+    <Color x:Key="AccentBaseColor">#FF60A917</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CC60A917</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#9960A917</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Indigo.xaml b/MahApps.Metro/Styles/Accents/Indigo.xaml
index c2bca3b5cb..7a6008007c 100644
--- a/MahApps.Metro/Styles/Accents/Indigo.xaml
+++ b/MahApps.Metro/Styles/Accents/Indigo.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF4E00BC</Color>
     
+    <Color x:Key="AccentBaseColor">#FF6A00FF</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CC6A00FF</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#996A00FF</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Lime.xaml b/MahApps.Metro/Styles/Accents/Lime.xaml
index ee6b7c9329..16dbe6b198 100644
--- a/MahApps.Metro/Styles/Accents/Lime.xaml
+++ b/MahApps.Metro/Styles/Accents/Lime.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF799100</Color>
     
+    <Color x:Key="AccentBaseColor">#FFA4C400</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CCA4C400</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99A4C400</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Magenta.xaml b/MahApps.Metro/Styles/Accents/Magenta.xaml
index c744161dd9..5a48b4e9f4 100644
--- a/MahApps.Metro/Styles/Accents/Magenta.xaml
+++ b/MahApps.Metro/Styles/Accents/Magenta.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF9F0055</Color>
     
+    <Color x:Key="AccentBaseColor">#FFD80073</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CCD80073</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99D80073</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Mauve.xaml b/MahApps.Metro/Styles/Accents/Mauve.xaml
index 7f13c36259..b0e55b0a5b 100644
--- a/MahApps.Metro/Styles/Accents/Mauve.xaml
+++ b/MahApps.Metro/Styles/Accents/Mauve.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF574766</Color>
     
+    <Color x:Key="AccentBaseColor">#FF76608A</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CC76608A</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#9976608A</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Olive.xaml b/MahApps.Metro/Styles/Accents/Olive.xaml
index d3fb6b22bd..7a0bd85fd2 100644
--- a/MahApps.Metro/Styles/Accents/Olive.xaml
+++ b/MahApps.Metro/Styles/Accents/Olive.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF50634A</Color>
     
+    <Color x:Key="AccentBaseColor">#FF6D8764</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CC6D8764</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#996D8764</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Orange.xaml b/MahApps.Metro/Styles/Accents/Orange.xaml
index 62994ddcb1..c76d0b33bf 100644
--- a/MahApps.Metro/Styles/Accents/Orange.xaml
+++ b/MahApps.Metro/Styles/Accents/Orange.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FFB94C00</Color>
     
+    <Color x:Key="AccentBaseColor">#FFFA6800</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CCFA6800</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99FA6800</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Pink.xaml b/MahApps.Metro/Styles/Accents/Pink.xaml
index c9dd0182b4..ea70d4f4a5 100644
--- a/MahApps.Metro/Styles/Accents/Pink.xaml
+++ b/MahApps.Metro/Styles/Accents/Pink.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FFB45499</Color>
     
+    <Color x:Key="AccentBaseColor">#FFF472D0</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CCF472D0</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99F472D0</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Purple.xaml b/MahApps.Metro/Styles/Accents/Purple.xaml
index 1a0e699649..5f99c8cfee 100644
--- a/MahApps.Metro/Styles/Accents/Purple.xaml
+++ b/MahApps.Metro/Styles/Accents/Purple.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF5133AB</Color>
 
+    <Color x:Key="AccentBaseColor">#FF6459DF</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CC6459DF</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#996459DF</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Red.xaml b/MahApps.Metro/Styles/Accents/Red.xaml
index a83a28d32d..7a2720fa09 100644
--- a/MahApps.Metro/Styles/Accents/Red.xaml
+++ b/MahApps.Metro/Styles/Accents/Red.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FFA90E00</Color>
     
+    <Color x:Key="AccentBaseColor">#FFE51400</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CCE51400</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99E51400</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Sienna.xaml b/MahApps.Metro/Styles/Accents/Sienna.xaml
index c391a3bcef..cd296a6f23 100644
--- a/MahApps.Metro/Styles/Accents/Sienna.xaml
+++ b/MahApps.Metro/Styles/Accents/Sienna.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF763C21</Color>
     
+    <Color x:Key="AccentBaseColor">#FFA0522D</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CCA0522D</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99A0522D</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Steel.xaml b/MahApps.Metro/Styles/Accents/Steel.xaml
index 588bdc60cf..19dfcdd59f 100644
--- a/MahApps.Metro/Styles/Accents/Steel.xaml
+++ b/MahApps.Metro/Styles/Accents/Steel.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF4A5763</Color>
     
+    <Color x:Key="AccentBaseColor">#FF647687</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CC647687</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99647687</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Taupe.xaml b/MahApps.Metro/Styles/Accents/Taupe.xaml
index 2673a4c033..4c783a4cfd 100644
--- a/MahApps.Metro/Styles/Accents/Taupe.xaml
+++ b/MahApps.Metro/Styles/Accents/Taupe.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF635939</Color>
     
+    <Color x:Key="AccentBaseColor">#FF87794E</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CC87794E</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#9987794E</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Teal.xaml b/MahApps.Metro/Styles/Accents/Teal.xaml
index bdaae9dbe6..b9eb44b25b 100644
--- a/MahApps.Metro/Styles/Accents/Teal.xaml
+++ b/MahApps.Metro/Styles/Accents/Teal.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF007E7D</Color>
     
+    <Color x:Key="AccentBaseColor">#FF00ABA9</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CC00ABA9</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#9900ABA9</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Violet.xaml b/MahApps.Metro/Styles/Accents/Violet.xaml
index cb5e2569ee..93e8536690 100644
--- a/MahApps.Metro/Styles/Accents/Violet.xaml
+++ b/MahApps.Metro/Styles/Accents/Violet.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FF7D00BC</Color>
     
+    <Color x:Key="AccentBaseColor">#FFAA00FF</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CCAA00FF</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99AA00FF</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Accents/Yellow.xaml b/MahApps.Metro/Styles/Accents/Yellow.xaml
index fa6da112fe..eccbca902e 100644
--- a/MahApps.Metro/Styles/Accents/Yellow.xaml
+++ b/MahApps.Metro/Styles/Accents/Yellow.xaml
@@ -6,6 +6,8 @@
 
     <Color x:Key="HighlightColor">#FFBBA404</Color>
     
+    <Color x:Key="AccentBaseColor">#FFFEDE06</Color>
+    <!--80%-->
     <Color x:Key="AccentColor">#CCFEDE06</Color>
     <!--60%-->
     <Color x:Key="AccentColor2">#99FEDE06</Color>
@@ -16,6 +18,7 @@
 
     <!-- re-set brushes too -->
     <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
@@ -43,4 +46,8 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Colors.xaml b/MahApps.Metro/Styles/Colors.xaml
index 913d654e3e..e0c051536d 100644
--- a/MahApps.Metro/Styles/Colors.xaml
+++ b/MahApps.Metro/Styles/Colors.xaml
@@ -10,6 +10,7 @@
 
     <!--ACCENT COLORS-->
     <Color x:Key="HighlightColor">#FF086F9E</Color>
+    <Color x:Key="AccentBaseColor">#FF119EDA</Color>
     <!--80%-->
     <Color x:Key="AccentColor">#CC119EDA</Color>
     <!--60%-->
@@ -61,6 +62,7 @@
     <SolidColorBrush x:Key="SemiTransparentGreyBrush" Color="#40808080"/>
     <SolidColorBrush x:Key="ControlsDisabledBrush" Color="#A5FFFFFF" />
 
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{DynamicResource AccentBaseColor}"/>
     <SolidColorBrush x:Key="AccentColorBrush" Color="{DynamicResource AccentColor}"/>
     <SolidColorBrush x:Key="AccentColorBrush2" Color="{DynamicResource AccentColor2}"/>
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{DynamicResource AccentColor3}"/>
@@ -176,4 +178,19 @@
     <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+    
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10" Color="#FF999999" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10" Color="#FF333333" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffMouseOverBorderBrush.Win10" Color="#FF000000" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffDisabledBorderBrush.Win10" Color="#FF999999" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffSwitchBrush.Win10" Color="Transparent" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchDisabledBrush.Win10" Color="#FFCCCCCC" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10" Color="#FF333333" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOverBrush.Win10" Color="#FF000000" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorPressedBrush.Win10" Color="#FFFFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10" Color="#FF999999" options:Freeze="True" />
+    
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
index c09527efed..da79043035 100644
--- a/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ b/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
-    
+                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters">
+
     <!--  Metro style  -->
 
     <Style x:Key="MetroToggleSwitchButton"
@@ -13,82 +14,58 @@
            TargetType="{x:Type Controls:ToggleSwitch}" />
 
     <!--  Win10 style  -->
+    
+    <converters:ThicknessToDoubleConverter x:Key="ThicknessToDouble" />
 
     <Style x:Key="MahApps.Metro.Styles.ToggleSwitchButton.Win10"
            BasedOn="{StaticResource MetroToggleSwitchButton}"
            TargetType="{x:Type Controls:ToggleSwitchButton}">
-        <Setter Property="Width" Value="50" />
+        <Setter Property="Width" Value="44" />
         <Setter Property="Height" Value="20" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Padding" Value="2" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BlackBrush}" />
-        <Setter Property="OffSwitchBrush" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="OnSwitchBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource BlackBrush}" />
-        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10}" />
+        <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffSwitchBrush.Win10}" />
+        <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10}" />
+        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10}" />
+        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10}" />
         <Setter Property="ThumbIndicatorWidth" Value="10" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Controls:ToggleSwitchButton}">
                     <Grid>
                         <Grid x:Name="PART_SwitchTrack"
-                              SnapsToDevicePixels="True"
+                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                               UseLayoutRounding="False">
-                            <Border Background="{TemplateBinding BorderBrush}"
-                                    BorderThickness="0"
-                                    CornerRadius="10"
-                                    SnapsToDevicePixels="False">
-                                <Grid>
-                                    <Border x:Name="PART_SwitchBrushBorder"
-                                            Margin="{TemplateBinding BorderThickness}"
-                                            Background="{TemplateBinding OffSwitchBrush}"
-                                            BorderThickness="0"
-                                            CornerRadius="8"
-                                            SnapsToDevicePixels="False" />
-                                    <Ellipse x:Name="PART_ThumbIndicator"
-                                             Width="{TemplateBinding ThumbIndicatorWidth}"
-                                             Height="{TemplateBinding ThumbIndicatorWidth}"
-                                             Margin="5 0"
-                                             HorizontalAlignment="Left"
-                                             Fill="{TemplateBinding ThumbIndicatorBrush}"
-                                             Stroke="Transparent"
-                                             StrokeThickness="0">
-                                        <Ellipse.RenderTransform>
-                                            <TranslateTransform x:Name="PART_ThumbTranslate" />
-                                        </Ellipse.RenderTransform>
-                                    </Ellipse>
-                                </Grid>
-                            </Border>
-                            <Border x:Name="PART_BackgroundOverlay"
-                                    Background="{DynamicResource WhiteBrush}"
-                                    BorderThickness="0"
-                                    Opacity="0"
-                                    CornerRadius="10"
-                                    SnapsToDevicePixels="False" />
-                            <!--  <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 WhiteBrush}"  -->
-                            <!--  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>-->
+                            <Rectangle x:Name="PART_SwitchBrushOuterBorder"
+                                       Height="20"
+                                       RadiusX="10"
+                                       RadiusY="10"
+                                       Fill="{TemplateBinding OffSwitchBrush}"
+                                       Stroke="{TemplateBinding BorderBrush}"
+                                       StrokeThickness="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessToDouble}}"
+                                       Width="44" />
+                            <Rectangle x:Name="PART_SwitchBrushBorder"
+                                       Fill="{TemplateBinding OnSwitchBrush}"
+                                       Opacity="0"
+                                       Height="20"
+                                       RadiusX="10"
+                                       RadiusY="10"
+                                       StrokeThickness="0"
+                                       Width="44" />
+                            <Grid x:Name="PART_ThumbIndicator"
+                                  HorizontalAlignment="Left"
+                                  Height="20"
+                                  Width="20">
+                                <Grid.RenderTransform>
+                                    <TranslateTransform x:Name="PART_ThumbTranslate" />
+                                </Grid.RenderTransform>
+                                <Ellipse x:Name="PART_ThumbIndicatorInner"
+                                         Fill="{TemplateBinding ThumbIndicatorBrush}"
+                                         Height="{TemplateBinding ThumbIndicatorWidth}"
+                                         Width="{TemplateBinding ThumbIndicatorWidth}" />
+                            </Grid>
                         </Grid>
                         <Thumb x:Name="PART_DraggingThumb">
                             <Thumb.Template>
@@ -100,39 +77,63 @@
                         <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>
+                                <VisualState x:Name="Disabled" />
+                                <VisualState x:Name="MouseOver" />
+                                <VisualState x:Name="Pressed" />
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="ToggleButton.IsChecked" Value="True">
-                            <Setter Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OnSwitchBrush, Mode=OneWay}" />
-                            <Setter TargetName="PART_SwitchBrushBorder" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="PART_ThumbIndicator" Property="Fill" Value="{DynamicResource WhiteBrush}" />
+                        <!--  Checked  -->
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Opacity" Value="0" />
+                            <Setter TargetName="PART_SwitchBrushBorder" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10}" />
                         </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_ThumbIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ThumbIndicatorDisabledBrush}" />
+                        <!--  MouseOver  -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsChecked" Value="False" />
+                                <Condition Property="IsEnabled" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Stroke" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffMouseOverBorderBrush.Win10}" />
+                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOverBrush.Win10}" />
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsChecked" Value="True" />
+                                <Condition Property="IsEnabled" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_SwitchBrushBorder" Property="Fill" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10}" />
+                        </MultiTrigger>
+                        <!--  Pressed  -->
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Opacity" Value="0" />
+                            <Setter TargetName="PART_SwitchBrushBorder" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_SwitchBrushBorder" Property="Fill" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10}" />
+                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorPressedBrush.Win10}" />
                         </Trigger>
+                        <!--  Disabled  -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsEnabled" Value="False" />
+                                <Condition Property="IsChecked" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Opacity" Value="0" />
+                            <Setter TargetName="PART_SwitchBrushBorder" Property="Opacity" Value="1" />
+                            <Setter TargetName="PART_SwitchBrushBorder" Property="Fill" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchDisabledBrush.Win10}" />
+                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ThumbIndicatorDisabledBrush}" />
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsEnabled" Value="False" />
+                                <Condition Property="IsChecked" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Stroke" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffDisabledBorderBrush.Win10}" />
+                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ThumbIndicatorDisabledBrush}" />
+                        </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -142,12 +143,12 @@
     <Style x:Key="MahApps.Metro.Styles.ToggleSwitch.Win10"
            BasedOn="{StaticResource MetroToggleSwitch}"
            TargetType="{x:Type Controls:ToggleSwitch}">
-        <Setter Property="OffSwitchBrush" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="OnSwitchBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource BlackBrush}" />
-        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffSwitchBrush.Win10}" />
+        <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10}" />
+        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10}" />
+        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10}" />
         <Setter Property="ThumbIndicatorWidth" Value="10" />
         <Setter Property="ToggleSwitchButtonStyle" Value="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton.Win10}" />
     </Style>
-    
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MahApps.Metro/Themes/ToggleSwitch.xaml b/MahApps.Metro/Themes/ToggleSwitch.xaml
index 5936c20fbe..335816c9b6 100644
--- a/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -11,6 +11,7 @@
         <Setter Property="OffSwitchBrush" Value="{DynamicResource GrayBrush4}" />
         <Setter Property="OnSwitchBrush" Value="{DynamicResource AccentColorBrush}" />
         <Setter Property="Padding" Value="2" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource BlackBrush}" />
         <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource GrayBrush4}" />
         <Setter Property="ThumbIndicatorWidth" Value="13" />
diff --git a/samples/MetroDemo/ExampleViews/ButtonsExample.xaml b/samples/MetroDemo/ExampleViews/ButtonsExample.xaml
index f903b72a83..2dbd412da2 100644
--- a/samples/MetroDemo/ExampleViews/ButtonsExample.xaml
+++ b/samples/MetroDemo/ExampleViews/ButtonsExample.xaml
@@ -192,16 +192,30 @@
             </StackPanel.Resources>
             <Label Content="Enable / Visible" Style="{DynamicResource DescriptionHeaderStyle}" />
             <Controls:ToggleSwitch x:Name="enabledSwitch"
+                                   Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
                                    Margin="{StaticResource ControlMargin}"
                                    IsChecked="True"
                                    OffLabel="Disabled"
                                    OnLabel="Enabled" />
             <Controls:ToggleSwitch x:Name="visibleSwitch"
+                                   Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
                                    Margin="{StaticResource ControlMargin}"
                                    IsChecked="False"
                                    OffLabel="Collapsed"
                                    OnLabel="Visible" />
-            <Controls:ToggleSwitch IsEnabled="{Binding ElementName=enabledSwitch, Path=IsChecked}" Visibility="{Binding ElementName=visibleSwitch, Path=IsChecked, Converter={StaticResource btv}}" />
+            <Controls:ToggleSwitch Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
+                                   IsEnabled="{Binding ElementName=enabledSwitch, Path=IsChecked}"
+                                   Margin="{StaticResource ControlMargin}"
+                                   Visibility="{Binding ElementName=visibleSwitch, Path=IsChecked, Converter={StaticResource btv}}" />
+
+            <Controls:ToggleSwitch Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
+                                   Margin="{StaticResource ControlMargin}"
+                                   IsChecked="True"
+                                   IsEnabled="False" />
+            <Controls:ToggleSwitch Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
+                                   Margin="{StaticResource ControlMargin}"
+                                   IsChecked="False"
+                                   IsEnabled="False" />
         </StackPanel>
 
         <StackPanel Grid.Row="1"

From 8508307227234a898c1faac317d176a9bbf50161 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 10 Mar 2016 22:58:07 +0100
Subject: [PATCH 08/10] MahApps.Metro.Styles.ToggleSwitchButton
 MahApps.Metro.Styles.ToggleSwitch

---
 MahApps.Metro/Controls/ToggleSwitch.cs             |  7 +++++--
 MahApps.Metro/Controls/ToggleSwitchButton.cs       |  6 +++++-
 MahApps.Metro/Styles/Controls.ToggleSwitch.xaml    | 14 ++++++++++----
 MahApps.Metro/Themes/Generic.xaml                  |  4 ++++
 MahApps.Metro/Themes/ToggleSwitch.xaml             |  6 +++---
 samples/MetroDemo/ExampleViews/ButtonsExample.xaml |  4 ++--
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/MahApps.Metro/Controls/ToggleSwitch.cs b/MahApps.Metro/Controls/ToggleSwitch.cs
index b671ffba0a..7872b42231 100644
--- a/MahApps.Metro/Controls/ToggleSwitch.cs
+++ b/MahApps.Metro/Controls/ToggleSwitch.cs
@@ -267,10 +267,13 @@ private static void OnIsCheckedChanged(DependencyObject d, DependencyPropertyCha
             }
         }
 
-        public ToggleSwitch()
+        static ToggleSwitch()
         {
-            DefaultStyleKey = typeof(ToggleSwitch);
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(ToggleSwitch), new FrameworkPropertyMetadata(typeof(ToggleSwitch)));
+        }
 
+        public ToggleSwitch()
+        {
             PreviewKeyUp += ToggleSwitch_PreviewKeyUp;
             MouseUp += (sender, args) => Keyboard.Focus(this);
         }
diff --git a/MahApps.Metro/Controls/ToggleSwitchButton.cs b/MahApps.Metro/Controls/ToggleSwitchButton.cs
index 1ed6192bb0..93b443876d 100644
--- a/MahApps.Metro/Controls/ToggleSwitchButton.cs
+++ b/MahApps.Metro/Controls/ToggleSwitchButton.cs
@@ -97,9 +97,13 @@ public double ThumbIndicatorWidth
             set { SetValue(ThumbIndicatorWidthProperty, value); }
         }
 
+        static ToggleSwitchButton()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(ToggleSwitchButton), new FrameworkPropertyMetadata(typeof(ToggleSwitchButton)));
+        }
+
         public ToggleSwitchButton()
         {
-            DefaultStyleKey = typeof(ToggleSwitchButton);
             isCheckedPropertyChangeNotifier = new PropertyChangeNotifier(this, ToggleSwitchButton.IsCheckedProperty);
             isCheckedPropertyChangeNotifier.ValueChanged += IsCheckedPropertyChangeNotifierValueChanged;
         }
diff --git a/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
index da79043035..b38128773b 100644
--- a/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ b/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -3,14 +3,20 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
                     xmlns:converters="clr-namespace:MahApps.Metro.Converters">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/ToggleSwitch.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
     <!--  Metro style  -->
 
+    <!--  obsolete  -->
     <Style x:Key="MetroToggleSwitchButton"
-           BasedOn="{StaticResource {x:Type Controls:ToggleSwitchButton}}"
+           BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton}"
            TargetType="{x:Type Controls:ToggleSwitchButton}" />
 
+    <!--  obsolete  -->
     <Style x:Key="MetroToggleSwitch"
-           BasedOn="{StaticResource {x:Type Controls:ToggleSwitch}}"
+           BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitch}"
            TargetType="{x:Type Controls:ToggleSwitch}" />
 
     <!--  Win10 style  -->
@@ -18,7 +24,7 @@
     <converters:ThicknessToDoubleConverter x:Key="ThicknessToDouble" />
 
     <Style x:Key="MahApps.Metro.Styles.ToggleSwitchButton.Win10"
-           BasedOn="{StaticResource MetroToggleSwitchButton}"
+           BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton}"
            TargetType="{x:Type Controls:ToggleSwitchButton}">
         <Setter Property="Width" Value="44" />
         <Setter Property="Height" Value="20" />
@@ -141,7 +147,7 @@
     </Style>
 
     <Style x:Key="MahApps.Metro.Styles.ToggleSwitch.Win10"
-           BasedOn="{StaticResource MetroToggleSwitch}"
+           BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitch}"
            TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffSwitchBrush.Win10}" />
         <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10}" />
diff --git a/MahApps.Metro/Themes/Generic.xaml b/MahApps.Metro/Themes/Generic.xaml
index dbf01b5b26..38ca6fa761 100644
--- a/MahApps.Metro/Themes/Generic.xaml
+++ b/MahApps.Metro/Themes/Generic.xaml
@@ -35,6 +35,10 @@
 
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/Dialogs/BaseMetroDialog.xaml" />
     </ResourceDictionary.MergedDictionaries>
+    
+    <!--  set up default styles for our custom controls  -->
+    <Style TargetType="{x:Type controls:ToggleSwitchButton}" BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton}" />
+    <Style TargetType="{x:Type controls:ToggleSwitch}" BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitch}" />
 
     <Style TargetType="{x:Type controls:ContentControlEx}">
         <Setter Property="Background" Value="Transparent" />
diff --git a/MahApps.Metro/Themes/ToggleSwitch.xaml b/MahApps.Metro/Themes/ToggleSwitch.xaml
index 335816c9b6..6ade4a6952 100644
--- a/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style TargetType="{x:Type Controls:ToggleSwitchButton}">
+    <Style x:Key="MahApps.Metro.Styles.ToggleSwitchButton" TargetType="{x:Type Controls:ToggleSwitchButton}">
         <Setter Property="Width" Value="70" />
         <Setter Property="Height" Value="35" />
         <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush4}" />
@@ -88,7 +88,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type Controls:ToggleSwitch}">
+    <Style x:Key="MahApps.Metro.Styles.ToggleSwitch" TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="FontFamily" Value="{DynamicResource ToggleSwitchFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ToggleSwitchFontSize}" />
         <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
@@ -101,7 +101,7 @@
         <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource BlackBrush}" />
         <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource GrayBrush4}" />
         <Setter Property="ThumbIndicatorWidth" Value="13" />
-        <Setter Property="ToggleSwitchButtonStyle" Value="{StaticResource {x:Type Controls:ToggleSwitchButton}}" />
+        <Setter Property="ToggleSwitchButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.ToggleSwitchButton}" />
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
         <Setter Property="HeaderTemplate">
             <Setter.Value>
diff --git a/samples/MetroDemo/ExampleViews/ButtonsExample.xaml b/samples/MetroDemo/ExampleViews/ButtonsExample.xaml
index 2dbd412da2..6444e83848 100644
--- a/samples/MetroDemo/ExampleViews/ButtonsExample.xaml
+++ b/samples/MetroDemo/ExampleViews/ButtonsExample.xaml
@@ -158,14 +158,14 @@
                     HorizontalAlignment="Center">
             <StackPanel.Resources>
                 <Style x:Key="CustomMetroToggleSwitch"
-                       BasedOn="{StaticResource MetroToggleSwitch}"
+                       BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitch}"
                        TargetType="{x:Type Controls:ToggleSwitch}">
                     <Setter Property="OffLabel" Value="False" />
                     <Setter Property="OnLabel" Value="True" />
                     <Setter Property="SwitchForeground" Value="Red" />
                 </Style>
                 <Style x:Key="CustomMetroToggleSwitchButton"
-                       BasedOn="{StaticResource MetroToggleSwitchButton}"
+                       BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton}"
                        TargetType="{x:Type Controls:ToggleSwitchButton}">
                     <Setter Property="SwitchForeground" Value="YellowGreen" />
                 </Style>

From 8fbbd609650a0506239c0490bd12dc6da0bdddb1 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 10 Mar 2016 23:23:51 +0100
Subject: [PATCH 09/10] TemplateBinding Height/Width calculate RadiusX/RadiusY
 by Height

---
 .../RectangleHeightToRadiusConverter.cs       | 37 +++++++++++++++++++
 MahApps.Metro/MahApps.Metro.NET45.csproj      |  1 +
 MahApps.Metro/MahApps.Metro.csproj            |  1 +
 .../Styles/Controls.ToggleSwitch.xaml         | 20 +++++-----
 4 files changed, 49 insertions(+), 10 deletions(-)
 create mode 100644 MahApps.Metro/Converters/RectangleHeightToRadiusConverter.cs

diff --git a/MahApps.Metro/Converters/RectangleHeightToRadiusConverter.cs b/MahApps.Metro/Converters/RectangleHeightToRadiusConverter.cs
new file mode 100644
index 0000000000..2684c9ee25
--- /dev/null
+++ b/MahApps.Metro/Converters/RectangleHeightToRadiusConverter.cs
@@ -0,0 +1,37 @@
+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/MahApps.Metro/MahApps.Metro.NET45.csproj b/MahApps.Metro/MahApps.Metro.NET45.csproj
index 25be126f05..c8f42f8b62 100644
--- a/MahApps.Metro/MahApps.Metro.NET45.csproj
+++ b/MahApps.Metro/MahApps.Metro.NET45.csproj
@@ -228,6 +228,7 @@
     <Compile Include="Controls\VisualStates.cs" />
     <Compile Include="Controls\WindowCommands.cs" />
     <Compile Include="Converters\NullToUnsetValueConverter.cs" />
+    <Compile Include="Converters\RectangleHeightToRadiusConverter.cs" />
     <Compile Include="Converters\ResizeModeMinMaxButtonVisibilityConverter.cs" />
     <Compile Include="Converters\StringToVisibilityConverter.cs" />
     <Compile Include="Converters\ThicknessBindingConverter.cs" />
diff --git a/MahApps.Metro/MahApps.Metro.csproj b/MahApps.Metro/MahApps.Metro.csproj
index 4574c6f884..65ced26216 100644
--- a/MahApps.Metro/MahApps.Metro.csproj
+++ b/MahApps.Metro/MahApps.Metro.csproj
@@ -179,6 +179,7 @@
     <Compile Include="Converters\BackgroundToForegroundConverter.cs" />
     <Compile Include="Converters\ClockDegreeConverter.cs" />
     <Compile Include="Converters\NullToUnsetValueConverter.cs" />
+    <Compile Include="Converters\RectangleHeightToRadiusConverter.cs" />
     <Compile Include="Converters\ThicknessBindingConverter.cs" />
     <Compile Include="Converters\IsNullConverter.cs" />
     <Compile Include="Converters\FontSizeOffsetConverter.cs" />
diff --git a/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
index b38128773b..b2f3dfff42 100644
--- a/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ b/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -45,25 +45,25 @@
                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                               UseLayoutRounding="False">
                             <Rectangle x:Name="PART_SwitchBrushOuterBorder"
-                                       Height="20"
-                                       RadiusX="10"
-                                       RadiusY="10"
+                                       Height="{TemplateBinding Height}"
+                                       RadiusX="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Height, Converter={converters:RectangleHeightToRadiusConverter}, Mode=OneWay}"
+                                       RadiusY="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Height, Converter={converters:RectangleHeightToRadiusConverter}, Mode=OneWay}"
                                        Fill="{TemplateBinding OffSwitchBrush}"
                                        Stroke="{TemplateBinding BorderBrush}"
                                        StrokeThickness="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessToDouble}}"
-                                       Width="44" />
+                                       Width="{TemplateBinding Width}" />
                             <Rectangle x:Name="PART_SwitchBrushBorder"
                                        Fill="{TemplateBinding OnSwitchBrush}"
                                        Opacity="0"
-                                       Height="20"
-                                       RadiusX="10"
-                                       RadiusY="10"
+                                       Height="{TemplateBinding Height}"
+                                       RadiusX="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Height, Converter={converters:RectangleHeightToRadiusConverter}, Mode=OneWay}"
+                                       RadiusY="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Height, Converter={converters:RectangleHeightToRadiusConverter}, Mode=OneWay}"
                                        StrokeThickness="0"
-                                       Width="44" />
+                                       Width="{TemplateBinding Width}" />
                             <Grid x:Name="PART_ThumbIndicator"
                                   HorizontalAlignment="Left"
-                                  Height="20"
-                                  Width="20">
+                                  Height="{TemplateBinding Height}"
+                                  Width="{TemplateBinding Height}">
                                 <Grid.RenderTransform>
                                     <TranslateTransform x:Name="PART_ThumbTranslate" />
                                 </Grid.RenderTransform>

From 6ac03aaadfc429ada35cf23cdd29acca0d214d51 Mon Sep 17 00:00:00 2001
From: Jan Karger <punkerat76@gmail.com>
Date: Thu, 10 Mar 2016 23:52:19 +0100
Subject: [PATCH 10/10] update 1.3.0.md

---
 docs/release-notes/1.3.0.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/release-notes/1.3.0.md b/docs/release-notes/1.3.0.md
index abe36f5f7d..0dc765860e 100644
--- a/docs/release-notes/1.3.0.md
+++ b/docs/release-notes/1.3.0.md
@@ -42,6 +42,25 @@ MahApps.Metro v1.3.0 bug fix and feature release.
 - Dialog font sizes setting implementation #2380 #2383 (@petvetbr, @punker76)
 	+ changable via `DialogTitleFontSize` and `DialogMessageFontSize`
 - New attached dependency property `TextButton` in TextBoxHelper which handles the visibility of the button in `MetroButtonPasswordBox` and `MetroButtonTextBox`styles #2387
+- Win10 ToggleSwitch #2410
+  + new Win10 toggle switch styles: `MahApps.Metro.Styles.ToggleSwitchButton.Win10` and `MahApps.Metro.Styles.ToggleSwitch.Win10`
+  + new Metro toggle switch styles `MahApps.Metro.Styles.ToggleSwitchButton` and `MahApps.Metro.Styles.ToggleSwitch`
+  + fixed broken `IsPressed` state
+  + new brushes for the Win10 style  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10`  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10`  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.OffMouseOverBorderBrush.Win10`  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.OffDisabledBorderBrush.Win10`  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.OffSwitchBrush.Win10`  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10`  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchDisabledBrush.Win10`  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10`  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10`  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOverBrush.Win10`  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10`  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorPressedBrush.Win10`  
+  `MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10`
+  + new keys for all accent colors: `AccentBaseColor` and `AccentBaseColorBrush` (full color)
 
 # Closed Issues