diff --git a/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml
index d1892d8685..aba5e125ac 100644
--- a/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml
@@ -1,11 +1,16 @@
-<!--Version wo 10-6-2020 17:30 -->
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-       >
+        xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <Styles.Resources>
+    <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,6</Thickness>
+    <x:Double x:Key="ToggleSwitchPreContentMargin">6</x:Double>
+    <x:Double x:Key="ToggleSwitchPostContentMargin">6</x:Double>
+    <x:Double x:Key="ToggleSwitchThemeMinWidth">154</x:Double>
+    <x:Double x:Key="KnobOnPosition">20</x:Double>
+    <x:Double x:Key="KnobOffPosition">0</x:Double>
+  </Styles.Resources>
   <Design.PreviewWith>
     <StackPanel Margin="20" Width="250" Spacing="24" >
-
       <StackPanel Spacing="12" >
         <TextBlock
           Text="Automatic updates"
@@ -14,11 +19,10 @@
           Text="Updates will be automaticly Downloaded and installed shile the computer is shutting down or restarting"
           TextWrapping="Wrap"/>
         <ToggleSwitch HorizontalContentAlignment="Left"
-          Content="Enable automatic Updates?" 
-          OffContent="Uit" 
+          Content="Enable automatic Updates?"
+          OffContent="Uit"
           OnContent="Aan"
-          VerticalAlignment="Bottom"
-      />
+          VerticalAlignment="Bottom"/>
       </StackPanel>
 
       <StackPanel Spacing="12">
@@ -28,116 +32,110 @@
         <TextBlock
           Text="The previewer Shows a preview off your code, this could slow down your system"
           TextWrapping="Wrap"/>
-        <ToggleSwitch 
-          
-          Content="Previewer" 
-          IsChecked="True"
-        />
+        <ToggleSwitch
+          Content="Previewer"
+          IsChecked="True" />
       </StackPanel>
-
     </StackPanel>
   </Design.PreviewWith>
 
-     <Style Selector="ToggleSwitch">
-       <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForeground}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="Template">
-          <ControlTemplate>
-            <Grid
-              Background="{TemplateBinding Background}"
-              RowDefinitions="Auto,*">
-
-            <ContentPresenter x:Name="PART_ContentPresenter"
-              Grid.Row="0"
-              Content="{TemplateBinding Content}"
-              ContentTemplate="{TemplateBinding ContentTemplate}"
-              Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
-              VerticalAlignment="Top"/>
-
-              <Grid
-                Grid.Row="1"
-                MinWidth="{StaticResource ToggleSwitchThemeMinWidth}"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top">
-
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="{DynamicResource ToggleSwitchPreContentMargin}" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="{DynamicResource ToggleSwitchPostContentMargin}" />
-                </Grid.RowDefinitions>
-
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="12" MaxWidth="12" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <Grid x:Name="SwitchAreaGrid"
-
-                  Grid.RowSpan="3"
-                  Grid.ColumnSpan="3"
-                  Margin="0,5" />
-
-                <ContentPresenter x:Name="PART_OffContentPresenter"
-                  Grid.RowSpan="3"
-                  Grid.Column="2"
-                  Content="{TemplateBinding OffContent}"
-                  ContentTemplate="{TemplateBinding OffContentTemplate}"
-                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-
-                  <ContentPresenter x:Name="PART_OnContentPresenter"
-                    Grid.RowSpan="3"
-                    Grid.Column="2"
-                    Content="{TemplateBinding OnContent}"
-                    ContentTemplate="{TemplateBinding OnContentTemplate}"
-                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                          
-                 <Border x:Name="OuterBorder"
-                   Grid.Row="1"
-                   Height="20"
-                   Width="40" 
-                   CornerRadius="100"
-                   BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}" />
-                          
-                 <Border x:Name="SwitchKnobBounds"
-                   Grid.Row="1"
-                   Height="20"
-                   Width="40"
-                   CornerRadius="100"
-                   BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}"/>
-                          
-                 <Canvas x:Name="SwitchKnob" 
-                    Grid.Row="1"
-                    HorizontalAlignment="Left"
-                    Width="20"
-                    Height="20">
-
-                    <Grid x:Name="MovingKnobs"
-                      Width="20"
-                      Height="20"  >
-
-                      <Ellipse x:Name="SwitchKnobOn"
-                       Width="10"
-                      Height="10"/> 
-                   
-                           
-                    <Ellipse x:Name="SwitchKnobOff"
-                      Width="10"
-                       Height="10"  />
-                     
-                       <!--<Grid.RenderTransform>
+  <Style Selector="ToggleSwitch">
+    <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForeground}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid Background="{TemplateBinding Background}"
+          RowDefinitions="Auto,*">
+
+          <ContentPresenter x:Name="PART_ContentPresenter"
+            Grid.Row="0"
+            Content="{TemplateBinding Content}"
+            ContentTemplate="{TemplateBinding ContentTemplate}"
+            Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
+            VerticalAlignment="Top"/>
+
+          <Grid Grid.Row="1"
+            MinWidth="{StaticResource ToggleSwitchThemeMinWidth}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top">
+
+            <Grid.RowDefinitions>
+              <RowDefinition Height="{DynamicResource ToggleSwitchPreContentMargin}" />
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="{DynamicResource ToggleSwitchPostContentMargin}" />
+            </Grid.RowDefinitions>
+
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto" />
+              <ColumnDefinition Width="12" MaxWidth="12" />
+              <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <Grid x:Name="SwitchAreaGrid"
+              Grid.RowSpan="3"
+              Grid.ColumnSpan="3"
+              Margin="0,5" />
+
+            <ContentPresenter x:Name="PART_OffContentPresenter"
+              Grid.RowSpan="3"
+              Grid.Column="2"
+              Content="{TemplateBinding OffContent}"
+              ContentTemplate="{TemplateBinding OffContentTemplate}"
+              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+
+            <ContentPresenter x:Name="PART_OnContentPresenter"
+              Grid.RowSpan="3"
+              Grid.Column="2"
+              Content="{TemplateBinding OnContent}"
+              ContentTemplate="{TemplateBinding OnContentTemplate}"
+              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+
+            <Border x:Name="OuterBorder"
+              Grid.Row="1"
+              Height="20"
+              Width="40"
+              CornerRadius="100"
+              BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}" />
+
+            <Border x:Name="SwitchKnobBounds"
+              Grid.Row="1"
+              Height="20"
+              Width="40"
+              CornerRadius="100"
+              BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}"/>
+
+            <Canvas x:Name="SwitchKnob"
+               Grid.Row="1"
+               HorizontalAlignment="Left"
+               Width="20"
+               Height="20">
+
+              <Grid x:Name="MovingKnobs"
+                Width="20"
+                Height="20"  >
+
+                <Ellipse x:Name="SwitchKnobOn"
+                 Width="10"
+                Height="10"/>
+
+
+                <Ellipse x:Name="SwitchKnobOff"
+                  Width="10"
+                   Height="10"  />
+
+                <!--<Grid.RenderTransform>
                           <TranslateTransform x:Name="KnobTranslateTransform" />
                        </Grid.RenderTransform>-->
-                   </Grid>
-                 </Canvas>
-                
-                 <!--<Thumb x:Name="SwitchThumb"
+              </Grid>
+            </Canvas>
+
+            <!--<Thumb x:Name="SwitchThumb"
                    Grid.RowSpan="3"
                    Grid.ColumnSpan="3">
                    <Thumb.Template>
@@ -146,199 +144,179 @@
                      </ControlTemplate>
                    </Thumb.Template>
                  </Thumb>-->
-              </Grid>
-            </Grid>
-        </ControlTemplate>
-      </Setter>
-    </Style>
-  
-  <!--*********** Normal ********-->
-  <!--  Initial values If hardcode values in template they'll become Imutable -->
-  
-   
-   <Style Selector="ToggleSwitch /template/ Grid#SwitchAreaGrid">
-       <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackground}"/>
-  </Style>
-  
+          </Grid>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <!-- NormalState -->
+  <Style Selector="ToggleSwitch /template/ Grid#SwitchAreaGrid">
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackground}"/>
+  </Style>
+
   <Style Selector="ToggleSwitch /template/ Border#OuterBorder">
-     <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOff}"/>
-     <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOff}"/>
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOff}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOff}"/>
   </Style>
-  
+
   <Style Selector="ToggleSwitch /template/ Border#SwitchKnobBounds">
-     <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOn}"/>
-     <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOn}"/>
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOn}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOn}"/>
   </Style>
-  
+
   <Style Selector="ToggleSwitch /template/ Ellipse#SwitchKnobOn">
     <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOn}"/>
     <Setter Property="Stroke" Value="{DynamicResource ToggleSwitchKnobStrokeOn}"/>
   </Style>
-  
+
   <Style Selector="ToggleSwitch /template/ Ellipse#SwitchKnobOff">
     <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOff}"/>
     <Setter Property="Stroke" Value="{DynamicResource ToggleSwitchKnobStrokeOff}"/>
   </Style>
-  
+
   <Style Selector="ToggleSwitch /template/ Grid#MovingKnobs">
     <Setter Property="Canvas.Left" Value="{DynamicResource KnobOffPosition}"/>
-   <Setter Property="Transitions">
-     <Transitions>
-       <DoubleTransition Property="Canvas.Left" Duration="0:0:0.2" Easing="CubicEaseOut"/>
-     </Transitions>
-   </Setter>
-  </Style>
- 
-  <!--******** POINTEROVER *******-->
-              
-    <Style Selector="ToggleSwitch:pointerover /template/ Border#OuterBorder"> 
-      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}"/>
-      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}"/>
-    </Style>
-      
-    <Style Selector="ToggleSwitch:pointerover /template/ Ellipse#SwitchKnobOff"> 
-      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}"/>
-    </Style>
-  
-    <Style Selector="ToggleSwitch:pointerover /template/ Ellipse#SwitchKnobOn"> 
-      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}"/>
-    </Style>
-    
-    <Style Selector="ToggleSwitch:pointerover /template/ Border#SwitchKnobBounds"> 
-      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}"/>
-    </Style>
-         
-    <Style Selector="ToggleSwitch:pointerover /template/ Grid#SwitchAreaGrid"> 
-      <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}"/>
-    </Style>
-  
-  <!--******** PRESSED *******-->
-  
-      <Style Selector="ToggleSwitch:pressed /template/ Border#OuterBorder"> 
-        <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}"/>
-        <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
-      </Style>
-  
-      <Style Selector="ToggleSwitch:pressed /template/ Border#SwitchKnobBounds"> 
-        <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}"/>
-      </Style>
-  
-      <Style Selector="ToggleSwitch:pressed /template/ Ellipse#SwitchKnobOff"> 
-        <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}"/>
-      </Style>
-  
-      <Style Selector="ToggleSwitch:pressed /template/ Ellipse#SwitchKnobOn"> 
-        <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}"/>
-      </Style>
-    
-      <Style Selector="ToggleSwitch:pressed /template/ Grid#SwitchAreaGrid"> 
-        <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}"/>
-      </Style>
-    
-   <!--******** DISABLED *******-->
-
-      <Style Selector="ToggleSwitch:disabled">
-        <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}"/>
-      </Style>     
-        
-      <Style Selector="ToggleSwitch:disabled /template/ Border#OuterBorder"> 
-        <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}"/>
-        <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
-      </Style>
-      
-      <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOff"> 
-        <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}"/>
-      </Style>
-  
-      <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOn"> 
-        <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}"/>
-      </Style>
-    
-       <Style Selector="ToggleSwitch:disabled /template/ Border#SwitchKnobBounds"> 
-        <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}"/>
-      </Style> 
-    
-      <!--<Style Selector="ToggleSwitch:disabled /template/ Grid#SwitchAreaGrid"> 
+    <Setter Property="Transitions">
+      <Transitions>
+        <DoubleTransition Property="Canvas.Left" Duration="0:0:0.2" Easing="CubicEaseOut"/>
+      </Transitions>
+    </Setter>
+  </Style>
+
+  <!-- PointerOverState -->
+  <Style Selector="ToggleSwitch:pointerover /template/ Border#OuterBorder">
+    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}"/>
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:pointerover /template/ Ellipse#SwitchKnobOff">
+    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:pointerover /template/ Ellipse#SwitchKnobOn">
+    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:pointerover /template/ Border#SwitchKnobBounds">
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:pointerover /template/ Grid#SwitchAreaGrid">
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}"/>
+  </Style>
+
+  <!-- PressedState -->
+  <Style Selector="ToggleSwitch:pressed /template/ Border#OuterBorder">
+    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}"/>
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:pressed /template/ Border#SwitchKnobBounds">
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:pressed /template/ Ellipse#SwitchKnobOff">
+    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:pressed /template/ Ellipse#SwitchKnobOn">
+    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:pressed /template/ Grid#SwitchAreaGrid">
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}"/>
+  </Style>
+
+  <!-- DisabledState -->
+  <Style Selector="ToggleSwitch:disabled">
+    <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:disabled /template/ Border#OuterBorder">
+    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}"/>
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOff">
+    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOn">
+    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:disabled /template/ Border#SwitchKnobBounds">
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}"/>
+  </Style>
+
+  <!--<Style Selector="ToggleSwitch:disabled /template/ Grid#SwitchAreaGrid"> 
         <Setter Property="Background" Value="20"/>
       </Style>-->
-  
-  <!--******** CHECKED *******-->
-  
-    <Style Selector="ToggleSwitch:checked /template/ Grid#MovingKnobs">
-     <Setter Property="Canvas.Left" Value="{DynamicResource KnobOnPosition}"/>
-    </Style>
-     
-    <Style Selector="ToggleSwitch:checked /template/ Border#OuterBorder"> 
-      <Setter Property="Opacity" Value="0"/>
-    </Style>
-      
-    <Style Selector="ToggleSwitch:checked  /template/ Ellipse#SwitchKnobOff"> 
-       <Setter Property="Opacity" Value="0"/>
-    </Style>
-        
-    <Style Selector="ToggleSwitch:checked  /template/ Border#SwitchKnobBounds"> 
-      <Setter Property="Opacity" Value="1"/>
-    </Style>
-  
-    <Style Selector="ToggleSwitch:checked /template/ Ellipse#SwitchKnobOn"> 
-      <Setter Property="Opacity" Value="1"/>
-    </Style>
-  
-    <Style Selector="ToggleSwitch:checked /template/ ContentPresenter#PART_OffContentPresenter"> 
-      <Setter Property="Opacity" Value="0"/>
-    </Style>
-  
-    <Style Selector="ToggleSwitch:checked /template/ ContentPresenter#PART_OnContentPresenter"> 
-      <Setter Property="Opacity" Value="1"/>
-    </Style>
-     
-  
-  <!--******** UNCHECKED *******-->
-  
-   <Style Selector="ToggleSwitch:unchecked /template/ Grid#MovingKnobs"> 
-     <Setter Property="Canvas.Left" Value="{DynamicResource KnobOffPosition}"/>
-   </Style>
-  
-   <Style Selector="ToggleSwitch:unchecked /template/ Border#OuterBorder">
-     <Setter Property="Opacity" Value="1"/>
-   </Style>
-
-   <Style Selector="ToggleSwitch:unchecked /template/ Ellipse#SwitchKnobOff">
-     <Setter Property="Opacity" Value="1"/>
-   </Style>
-
-   <Style Selector="ToggleSwitch:unchecked /template/ Ellipse#SwitchKnobOn">
-     <Setter Property="Opacity" Value="0"/>
-   </Style>
-  
-   <Style Selector="ToggleSwitch:unchecked  /template/ Border#SwitchKnobBounds"> 
-     <Setter Property="Opacity" Value="0"/>
-   </Style>
-  
-   <Style Selector="ToggleSwitch:unchecked /template/ ContentPresenter#PART_OffContentPresenter">
-     <Setter Property="Opacity" Value="1"/>
-   </Style>
+
+  <!-- CheckedState -->
+  <Style Selector="ToggleSwitch:checked /template/ Grid#MovingKnobs">
+    <Setter Property="Canvas.Left" Value="{DynamicResource KnobOnPosition}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:checked /template/ Border#OuterBorder">
+    <Setter Property="Opacity" Value="0"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:checked  /template/ Ellipse#SwitchKnobOff">
+    <Setter Property="Opacity" Value="0"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:checked  /template/ Border#SwitchKnobBounds">
+    <Setter Property="Opacity" Value="1"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:checked /template/ Ellipse#SwitchKnobOn">
+    <Setter Property="Opacity" Value="1"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:checked /template/ ContentPresenter#PART_OffContentPresenter">
+    <Setter Property="Opacity" Value="0"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:checked /template/ ContentPresenter#PART_OnContentPresenter">
+    <Setter Property="Opacity" Value="1"/>
+  </Style>
+
+
+  <!--UncheckedState -->
+  <Style Selector="ToggleSwitch:unchecked /template/ Grid#MovingKnobs">
+    <Setter Property="Canvas.Left" Value="{DynamicResource KnobOffPosition}"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:unchecked /template/ Border#OuterBorder">
+    <Setter Property="Opacity" Value="1"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:unchecked /template/ Ellipse#SwitchKnobOff">
+    <Setter Property="Opacity" Value="1"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:unchecked /template/ Ellipse#SwitchKnobOn">
+    <Setter Property="Opacity" Value="0"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:unchecked  /template/ Border#SwitchKnobBounds">
+    <Setter Property="Opacity" Value="0"/>
+  </Style>
+
+  <Style Selector="ToggleSwitch:unchecked /template/ ContentPresenter#PART_OffContentPresenter">
+    <Setter Property="Opacity" Value="1"/>
+  </Style>
 
   <Style Selector="ToggleSwitch:unchecked /template/ ContentPresenter#PART_OnContentPresenter">
     <Setter Property="Opacity" Value="0"/>
   </Style>
-  
+
   <!--<Style Selector="ToggleSwitch:checked /template/Grid#MovingKnobs">
      <Setter Property="Canvas.Left" Value="{StaticResource KnobOffPosition}"/>
    </Style>-->
-     
-    
- <Styles.Resources>
-    <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,6</Thickness>
-    <x:Double x:Key="ToggleSwitchPreContentMargin">6</x:Double>
-    <x:Double x:Key="ToggleSwitchPostContentMargin">6</x:Double>
-    <x:Double x:Key="ToggleSwitchThemeMinWidth">154</x:Double>
-    <x:Double x:Key="KnobOnPosition">20</x:Double>
-    <x:Double x:Key="KnobOffPosition">0</x:Double>
- 
- </Styles.Resources>
-
 </Styles>