From 3e533db93e8c8a054e4e267f33c53bb08139d815 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Tue, 8 Oct 2019 10:27:01 +0200
Subject: [PATCH] (GH-3136) Introduce CheckBoxHelper and new Windows 10
 CheckBox Style

- A CheckBoxHelper was introduced to allow different Glyphs and Brushes for different Styles
- Introduced a new Windows 10 CheckBox Style that switches the colors for a better visibility, especially with a dark theme
	- Use Win10 check glyph Xaml path data from "Segoe MDL2 Assets"
	- Set Win10 BorderThickness to 2
---
 .../ExampleViews/ButtonsExample.xaml          |   6 +-
 .../Controls/Helper/CheckBoxHelper.cs         | 315 ++++++++++++++++++
 .../Styles/Controls.CheckBox.xaml             | 169 ++++++++--
 3 files changed, 457 insertions(+), 33 deletions(-)
 create mode 100644 src/MahApps.Metro/Controls/Helper/CheckBoxHelper.cs

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index 901b6f2a8f..5c3a9c1040 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -350,11 +350,13 @@
             <CheckBox Margin="{StaticResource ControlMargin}" Content="_Enabled" />
             <CheckBox Margin="{StaticResource ControlMargin}"
                       Content="Enabled"
-                      IsChecked="True" />
+                      IsChecked="True"
+                      IsThreeState="True" />
             <CheckBox Margin="{StaticResource ControlMargin}"
                       Content="Enabled"
                       IsChecked="{x:Null}"
-                      IsThreeState="True" />
+                      IsThreeState="True"
+                      Style="{StaticResource MahApps.Styles.CheckBox.Win10}" />
             <CheckBox Margin="{StaticResource ControlMargin}"
                       Content="Disabled"
                       IsEnabled="False" />
diff --git a/src/MahApps.Metro/Controls/Helper/CheckBoxHelper.cs b/src/MahApps.Metro/Controls/Helper/CheckBoxHelper.cs
new file mode 100644
index 0000000000..575392c746
--- /dev/null
+++ b/src/MahApps.Metro/Controls/Helper/CheckBoxHelper.cs
@@ -0,0 +1,315 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace MahApps.Metro.Controls
+{
+    public static class CheckBoxHelper
+    {
+
+        public static readonly DependencyProperty CheckBoxSizeProperty = DependencyProperty.RegisterAttached("CheckBoxSize", typeof(double), typeof(CheckBoxHelper), new FrameworkPropertyMetadata(18.0));
+
+        /// <summary>
+        /// Gets the size of the CheckBox itself.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static double GetCheckBoxSize(DependencyObject obj)
+        {
+            return (double)obj.GetValue(CheckBoxSizeProperty);
+        }
+
+        /// <summary>
+        /// Sets the size of the CheckBox itself.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetCheckBoxSize(DependencyObject obj, double value)
+        {
+            obj.SetValue(CheckBoxSizeProperty, value);
+        }
+
+
+        #region Checked
+        // Using a DependencyProperty as the backing store for CheckedGlyph.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty CheckedGlyphProperty = DependencyProperty.RegisterAttached("CheckedGlyph", typeof(object), typeof(CheckBoxHelper), new FrameworkPropertyMetadata());
+        public static readonly DependencyProperty CheckedGlyphTemplateProperty = DependencyProperty.RegisterAttached("CheckedGlyphTemplate", typeof(DataTemplate), typeof(CheckBoxHelper), new FrameworkPropertyMetadata());
+        public static readonly DependencyProperty CheckedBackgroundBrushProperty = DependencyProperty.RegisterAttached("CheckedBackgroundBrush", typeof(Brush), typeof(CheckBoxHelper), new FrameworkPropertyMetadata());
+        public static readonly DependencyProperty CheckedBorderBrushProperty = DependencyProperty.RegisterAttached("CheckedBorderBrush", typeof(Brush), typeof(CheckBoxHelper), new FrameworkPropertyMetadata());
+
+
+        /// <summary>
+        /// Gets the the Glyph for IsChecked = true.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static object GetCheckedGlyph(DependencyObject obj)
+        {
+            return (object)obj.GetValue(CheckedGlyphProperty);
+        }
+
+        /// <summary>
+        /// Sets the the Glyph for IsChecked = true.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetCheckedGlyph(DependencyObject obj, object value)
+        {
+            obj.SetValue(CheckedGlyphProperty, value);
+        }
+
+
+        /// <summary>
+        /// Gets the the Background for IsChecked = true.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static Brush GetCheckedBackgroundBrush(DependencyObject obj)
+        {
+            return (Brush)obj.GetValue(CheckedBackgroundBrushProperty);
+        }
+
+        /// <summary>
+        /// Sets the the Background for IsChecked = true.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetCheckedBackgroundBrush(DependencyObject obj, Brush value)
+        {
+            obj.SetValue(CheckedBackgroundBrushProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the the GlyphTemplate for IsChecked = true.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static DataTemplate GetCheckedGlyphTemplate(DependencyObject obj)
+        {
+            return (DataTemplate)obj.GetValue(CheckedGlyphTemplateProperty);
+        }
+
+        /// <summary>
+        /// Sets the the GlyphTemplate for IsChecked = true.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetCheckedGlyphTemplate(DependencyObject obj, DataTemplate value)
+        {
+            obj.SetValue(CheckedGlyphTemplateProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the the BorderBrush for IsChecked = true.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static Brush GetCheckedBorderBrush(DependencyObject obj)
+        {
+            return (Brush)obj.GetValue(CheckedBorderBrushProperty);
+        }
+
+        /// <summary>
+        /// Sets the the BorderBrush for IsChecked = true.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetCheckedBorderBrush(DependencyObject obj, Brush value)
+        {
+            obj.SetValue(CheckedBorderBrushProperty, value);
+        }
+
+        #endregion
+
+
+        #region UnChecked
+        // Using a DependencyProperty as the backing store for UnCheckedGlyph.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty UnCheckedGlyphProperty = DependencyProperty.RegisterAttached("UnCheckedGlyph", typeof(object), typeof(CheckBoxHelper), new FrameworkPropertyMetadata());
+        public static readonly DependencyProperty UnCheckedGlyphTemplateProperty = DependencyProperty.RegisterAttached("UnCheckedGlyphTemplate", typeof(DataTemplate), typeof(CheckBoxHelper), new FrameworkPropertyMetadata());
+        public static readonly DependencyProperty UnCheckedBackgroundBrushProperty = DependencyProperty.RegisterAttached("UnCheckedBackgroundBrush", typeof(Brush), typeof(CheckBoxHelper), new FrameworkPropertyMetadata());
+        public static readonly DependencyProperty UnCheckedBorderBrushProperty = DependencyProperty.RegisterAttached("UnCheckedBorderBrush", typeof(Brush), typeof(CheckBoxHelper), new FrameworkPropertyMetadata());
+
+
+        /// <summary>
+        /// Gets the the Glyph for IsChecked = false.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static object GetUnCheckedGlyph(DependencyObject obj)
+        {
+            return (object)obj.GetValue(UnCheckedGlyphProperty);
+        }
+
+        /// <summary>
+        /// Sets the the Glyph for IsChecked = false.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetUnCheckedGlyph(DependencyObject obj, object value)
+        {
+            obj.SetValue(UnCheckedGlyphProperty, value);
+        }
+
+
+        /// <summary>
+        /// Gets the the BackgroundBrush for IsChecked = false.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static Brush GetUnCheckedBackgroundBrush(DependencyObject obj)
+        {
+            return (Brush)obj.GetValue(UnCheckedBackgroundBrushProperty);
+        }
+
+        /// <summary>
+        /// Sets the the BackgroundBrush for IsChecked = false.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetUnCheckedBackgroundBrush(DependencyObject obj, Brush value)
+        {
+            obj.SetValue(UnCheckedBackgroundBrushProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the the GlyphTemplate for IsChecked = false.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static DataTemplate GetUnCheckedGlyphTemplate(DependencyObject obj)
+        {
+            return (DataTemplate)obj.GetValue(UnCheckedGlyphTemplateProperty);
+        }
+
+        /// <summary>
+        /// Sets the the GlyphTemplate for IsChecked = false.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetUnCheckedGlyphTemplate(DependencyObject obj, DataTemplate value)
+        {
+            obj.SetValue(UnCheckedGlyphTemplateProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the the BorderBrush for IsChecked = false.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static Brush GetUnCheckedBorderBrush(DependencyObject obj)
+        {
+            return (Brush)obj.GetValue(UnCheckedBorderBrushProperty);
+        }
+
+        /// <summary>
+        /// Sets the the BorderBrush for IsChecked = false.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetUnCheckedBorderBrush(DependencyObject obj, Brush value)
+        {
+            obj.SetValue(UnCheckedBorderBrushProperty, value);
+        }
+
+        #endregion
+
+
+        #region Intermediate
+        // Using a DependencyProperty as the backing store for IntermediateGlyph.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty IntermediateGlyphProperty = DependencyProperty.RegisterAttached("IntermediateGlyph", typeof(object), typeof(CheckBoxHelper), new FrameworkPropertyMetadata());
+        public static readonly DependencyProperty IntermediateGlyphTemplateProperty = DependencyProperty.RegisterAttached("IntermediateGlyphTemplate", typeof(DataTemplate), typeof(CheckBoxHelper), new FrameworkPropertyMetadata());
+        public static readonly DependencyProperty IntermediateBackgroundBrushProperty = DependencyProperty.RegisterAttached("IntermediateBackgroundBrush", typeof(Brush), typeof(CheckBoxHelper), new FrameworkPropertyMetadata());
+        public static readonly DependencyProperty IntermediateBorderBrushProperty = DependencyProperty.RegisterAttached("IntermediateBorderBrush", typeof(Brush), typeof(CheckBoxHelper), new FrameworkPropertyMetadata());
+
+
+        /// <summary>
+        /// Gets the the Glyph for IsChecked = null.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static object GetIntermediateGlyph(DependencyObject obj)
+        {
+            return (object)obj.GetValue(IntermediateGlyphProperty);
+        }
+
+        /// <summary>
+        /// Sets the the Glyph for IsChecked = null.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetIntermediateGlyph(DependencyObject obj, object value)
+        {
+            obj.SetValue(IntermediateGlyphProperty, value);
+        }
+
+
+        /// <summary>
+        /// Gets the the BackgroundBrush for IsChecked = null.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static Brush GetIntermediateBackgroundBrush(DependencyObject obj)
+        {
+            return (Brush)obj.GetValue(IntermediateBackgroundBrushProperty);
+        }
+
+        /// <summary>
+        /// Sets the the BackgroundBrush for IsChecked = null.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetIntermediateBackgroundBrush(DependencyObject obj, Brush value)
+        {
+            obj.SetValue(IntermediateBackgroundBrushProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the the GlyphTemplate for IsChecked = null.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static DataTemplate GetIntermediateGlyphTemplate(DependencyObject obj)
+        {
+            return (DataTemplate)obj.GetValue(IntermediateGlyphTemplateProperty);
+        }
+
+        /// <summary>
+        /// Sets the the GlyphTemplate for IsChecked = null.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetIntermediateGlyphTemplate(DependencyObject obj, DataTemplate value)
+        {
+            obj.SetValue(IntermediateGlyphTemplateProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the the BorderBrush for IsChecked = null.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static Brush GetIntermediateBorderBrush(DependencyObject obj)
+        {
+            return (Brush)obj.GetValue(IntermediateBorderBrushProperty);
+        }
+
+        /// <summary>
+        /// Sets the the BorderBrush for IsChecked = null.
+        /// </summary>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(CheckBox))]
+        public static void SetIntermediateBorderBrush(DependencyObject obj, Brush value)
+        {
+            obj.SetValue(IntermediateBorderBrushProperty, value);
+        }
+
+        #endregion
+
+    }
+}
diff --git a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
index 7a57f169c9..4a121697b2 100644
--- a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
@@ -5,9 +5,35 @@
     <!--  ********************************** CheckBoxStyle **********************************  -->
     <!--  adapted from http://brianlagunas.com/free-metro-light-and-dark-themes-for-wpf-and-silverlight-microsoft-controls/  -->
     <Style x:Key="MahApps.Styles.CheckBox" TargetType="CheckBox">
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
         <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Controls:CheckBoxHelper.CheckedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="Controls:CheckBoxHelper.CheckedBorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
+        <Setter Property="Controls:CheckBoxHelper.CheckedGlyphTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <Path Width="12"
+                          Height="10"
+                          Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"
+                          Fill="{DynamicResource MahApps.Brushes.Highlight}"
+                          Stretch="Fill"
+                          UseLayoutRounding="False" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Controls:CheckBoxHelper.IntermediateBackgroundBrush" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="Controls:CheckBoxHelper.IntermediateBorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
+        <Setter Property="Controls:CheckBoxHelper.IntermediateGlyphTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <Rectangle Width="8"
+                               Height="3"
+                               Fill="{DynamicResource MahApps.Brushes.Gray3}" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Controls:CheckBoxHelper.UnCheckedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="Controls:CheckBoxHelper.UnCheckedBorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
@@ -21,35 +47,65 @@
                 <ControlTemplate TargetType="CheckBox">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition x:Name="LeftCol" Width="18" />
+                            <ColumnDefinition x:Name="LeftCol" Width="Auto" />
                             <ColumnDefinition x:Name="RightCol" Width="*" />
                         </Grid.ColumnDefinitions>
                         <Grid x:Name="PART_CHECKBOX">
                             <Rectangle Margin="-6 0" Fill="{DynamicResource MahApps.Brushes.TransparentWhite}" />
-                            <Border x:Name="normal"
-                                    Width="18"
-                                    Height="18"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
+                            <Border x:Name="CheckedBorder"
+                                    Width="{TemplateBinding Controls:CheckBoxHelper.CheckBoxSize}"
+                                    Height="{TemplateBinding Controls:CheckBoxHelper.CheckBoxSize}"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Background="{TemplateBinding Controls:CheckBoxHelper.CheckedBackgroundBrush}"
+                                    BorderBrush="{TemplateBinding Controls:CheckBoxHelper.CheckedBorderBrush}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
                                     CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                            <Path x:Name="checkBox"
-                                  Width="12"
-                                  Height="10"
-                                  Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"
-                                  Fill="{DynamicResource MahApps.Brushes.Highlight}"
-                                  Opacity="0"
-                                  Stretch="Fill"
-                                  UseLayoutRounding="False" />
-                            <Rectangle x:Name="IndeterminateCheck"
-                                       Width="8"
-                                       Height="3"
-                                       Fill="{DynamicResource MahApps.Brushes.Gray3}"
-                                       Opacity="0" />
+                                    Opacity="0"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                <ContentControl Content="{TemplateBinding Controls:CheckBoxHelper.CheckedGlyph}"
+                                                ContentTemplate="{TemplateBinding Controls:CheckBoxHelper.CheckedGlyphTemplate}"
+                                                Focusable="False"
+                                                IsTabStop="False" />
+                            </Border>
+
+                            <Border x:Name="UnCheckedBorder"
+                                    Width="{TemplateBinding Controls:CheckBoxHelper.CheckBoxSize}"
+                                    Height="{TemplateBinding Controls:CheckBoxHelper.CheckBoxSize}"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Background="{TemplateBinding Controls:CheckBoxHelper.UnCheckedBackgroundBrush}"
+                                    BorderBrush="{TemplateBinding Controls:CheckBoxHelper.UnCheckedBorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                    Opacity="0"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                <ContentControl Content="{TemplateBinding Controls:CheckBoxHelper.UnCheckedGlyph}"
+                                                ContentTemplate="{TemplateBinding Controls:CheckBoxHelper.UnCheckedGlyphTemplate}"
+                                                Focusable="False"
+                                                IsTabStop="False" />
+                            </Border>
+
+                            <Border x:Name="IntermediateBorder"
+                                    Width="{TemplateBinding Controls:CheckBoxHelper.CheckBoxSize}"
+                                    Height="{TemplateBinding Controls:CheckBoxHelper.CheckBoxSize}"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Background="{TemplateBinding Controls:CheckBoxHelper.IntermediateBackgroundBrush}"
+                                    BorderBrush="{TemplateBinding Controls:CheckBoxHelper.IntermediateBorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                    Opacity="0"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                <ContentControl Content="{TemplateBinding Controls:CheckBoxHelper.IntermediateGlyph}"
+                                                ContentTemplate="{TemplateBinding Controls:CheckBoxHelper.IntermediateGlyphTemplate}"
+                                                Focusable="False"
+                                                IsTabStop="False" />
+                            </Border>
+
                             <Border x:Name="disabled"
-                                    Width="18"
-                                    Height="18"
+                                    Width="{TemplateBinding Controls:CheckBoxHelper.CheckBoxSize}"
+                                    Height="{TemplateBinding Controls:CheckBoxHelper.CheckBoxSize}"
                                     Background="{DynamicResource MahApps.Brushes.SemiTransparentWhite}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
                                     CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
@@ -85,16 +141,23 @@
                             <VisualStateGroup x:Name="CheckStates">
                                 <VisualState x:Name="Checked">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="checkBox"
+                                        <DoubleAnimation Storyboard.TargetName="CheckedBorder"
+                                                         Storyboard.TargetProperty="(UIElement.Opacity)"
+                                                         To="1"
+                                                         Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unchecked">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="UnCheckedBorder"
                                                          Storyboard.TargetProperty="(UIElement.Opacity)"
                                                          To="1"
                                                          Duration="0" />
                                     </Storyboard>
                                 </VisualState>
-                                <VisualState x:Name="Unchecked" />
                                 <VisualState x:Name="Indeterminate">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="IndeterminateCheck"
+                                        <DoubleAnimation Storyboard.TargetName="IntermediateBorder"
                                                          Storyboard.TargetProperty="(UIElement.Opacity)"
                                                          To="1"
                                                          Duration="0" />
@@ -105,16 +168,32 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="normal" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="CheckedBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="IntermediateBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="UnCheckedBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="normal" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+                            <Setter TargetName="CheckedBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+                            <Setter TargetName="IntermediateBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+                            <Setter TargetName="UnCheckedBorder" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="normal" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="CheckedBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="IntermediateBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="UnCheckedBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="FlowDirection" Value="RightToLeft">
-                            <Setter TargetName="checkBox" Property="LayoutTransform">
+                            <Setter TargetName="CheckedBorder" Property="LayoutTransform">
+                                <Setter.Value>
+                                    <ScaleTransform ScaleX="-1" />
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="IntermediateBorder" Property="LayoutTransform">
+                                <Setter.Value>
+                                    <ScaleTransform ScaleX="-1" />
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="UnCheckedBorder" Property="LayoutTransform">
                                 <Setter.Value>
                                     <ScaleTransform ScaleX="-1" />
                                 </Setter.Value>
@@ -124,7 +203,7 @@
                             <Setter Property="Padding" Value="0 0 6 0" />
                             <Setter TargetName="LeftCol" Property="Width" Value="*" />
                             <Setter TargetName="PART_CHECKBOX" Property="Grid.Column" Value="1" />
-                            <Setter TargetName="RightCol" Property="Width" Value="18" />
+                            <Setter TargetName="RightCol" Property="Width" Value="Auto" />
                             <Setter TargetName="contentPresenter" Property="Grid.Column" Value="0" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -133,4 +212,32 @@
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
+
+    <Style x:Key="MahApps.Styles.CheckBox.Win10"
+           BasedOn="{StaticResource MahApps.Styles.CheckBox}"
+           TargetType="CheckBox">
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="Controls:CheckBoxHelper.CheckBoxSize" Value="20" />
+        <Setter Property="Controls:CheckBoxHelper.CheckedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:CheckBoxHelper.CheckedBorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:CheckBoxHelper.CheckedGlyphTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <Path HorizontalAlignment="Center"
+                          VerticalAlignment="Center"
+                          Data="M90.890625,12.890625L95.109375,17.109375 30,82.265625 0.890625,53.109375 5.10937547683716,48.890625 30,73.734375 90.890625,12.890625z"
+                          Stretch="Uniform"
+                          Stroke="{DynamicResource MahApps.Brushes.IdealForeground}"
+                          UseLayoutRounding="False" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Controls:CheckBoxHelper.IntermediateGlyphTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <Rectangle Margin="4" Fill="{DynamicResource MahApps.Brushes.Gray3}" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>