diff --git a/.paket/paket.exe b/.paket/paket.exe
index 74209933b3..e8a9fe360b 100644
Binary files a/.paket/paket.exe and b/.paket/paket.exe differ
diff --git a/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj b/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj
index 94ca563844..cfaf12daf4 100644
--- a/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj
+++ b/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj
@@ -166,8 +166,9 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Project="..\.paket\paket.targets" />
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
         <Reference Include="Dragablz">
           <HintPath>..\packages\Dragablz\lib\net45\Dragablz.dll</HintPath>
@@ -178,7 +179,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
         <Reference Include="MahApps.Metro">
           <HintPath>..\packages\MahApps.Metro\lib\net45\MahApps.Metro.dll</HintPath>
@@ -193,5 +194,4 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\.paket\paket.targets" />
 </Project>
\ No newline at end of file
diff --git a/MahMaterialDragablzMashUp/MainWindow.xaml b/MahMaterialDragablzMashUp/MainWindow.xaml
index ad43738805..53bd2e88e9 100644
--- a/MahMaterialDragablzMashUp/MainWindow.xaml
+++ b/MahMaterialDragablzMashUp/MainWindow.xaml
@@ -5,7 +5,7 @@
                       xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"
                       xmlns:mahMaterialDragablzMashUp="clr-namespace:MahMaterialDragablzMashUp"
                       xmlns:dockablz="clr-namespace:Dragablz.Dockablz;assembly=Dragablz"
-                      xmlns:wpf="http://materialdesigninxaml.net/winfx/xaml/themes"
+                      xmlns:wpf="http://materialdesigninxaml.net/winfx/xaml/themes"                      
                       WindowTransitionsEnabled="False"
                       TextElement.Foreground="{DynamicResource MaterialDesignBody}"
                       Background="{DynamicResource MaterialDesignPaper}"					  
@@ -14,7 +14,7 @@
                       Title="Material-MahApps-Dragablz Mash Up" Height="640" Width="800">
     <controls:MetroWindow.Flyouts>
         <controls:FlyoutsControl>
-            <controls:Flyout x:Name="LeftFlyout" Position="Left" Header="Settings">
+            <controls:Flyout x:Name="LeftFlyout" Position="Left" Header="Settings" wpf:FlyoutAssist.HeaderColorMode="Accent">
                 <mahMaterialDragablzMashUp:FlyoutContent />
             </controls:Flyout>
         </controls:FlyoutsControl>
diff --git a/MainDemo.Wpf/Buttons.xaml b/MainDemo.Wpf/Buttons.xaml
index faa92e5094..929ab59120 100644
--- a/MainDemo.Wpf/Buttons.xaml
+++ b/MainDemo.Wpf/Buttons.xaml
@@ -247,7 +247,7 @@
                     Mate
                 </CheckBox>
                 <CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="0 0 8 8" VerticalAlignment="Center" 
-                      IsEnabled="False">
+                          IsEnabled="False"  IsChecked="True">
                     Disabled
                 </CheckBox>
             </StackPanel>
diff --git a/MainDemo.Wpf/Expander.xaml b/MainDemo.Wpf/Expander.xaml
index 32006f34bb..34295514fa 100644
--- a/MainDemo.Wpf/Expander.xaml
+++ b/MainDemo.Wpf/Expander.xaml
@@ -20,7 +20,7 @@
                       Header="Expander Example 1a">
                 <StackPanel Orientation="Vertical"
                             TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
-                            Margin="16">
+                            Margin="24,8,24,16">
                     <TextBlock Text="Your Content" />
                     <TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
                                TextWrapping="Wrap"/>
@@ -30,7 +30,7 @@
                       Header="Expander Example 1b">
                 <StackPanel Orientation="Vertical"
                             TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
-                            Margin="16"> 
+                            Margin="24,8,24,16"> 
                     <TextBlock Text="Your Content" />
                     <TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
                                TextWrapping="Wrap"/>
@@ -40,7 +40,7 @@
                       Header="Expander Example 1c">
                 <StackPanel Orientation="Vertical"
                             TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
-                            Margin="16">
+                            Margin="24,8,24,16">
                     <TextBlock Text="Your Content" />
                     <TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
                                TextWrapping="Wrap"/>
@@ -54,27 +54,29 @@
                       Header="Expander Example 2a">
                     <StackPanel Orientation="Vertical"
                             TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
-                            Margin="16">
+                            Margin="24,8,24,16">
                         <TextBlock Text="Your Content" />
                         <TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
                                TextWrapping="Wrap"/>
                     </StackPanel>
                 </Expander>
+                <Border Background="{DynamicResource MaterialDesignDivider}" Height="1" HorizontalAlignment="Stretch" SnapsToDevicePixels="True" />
                 <Expander HorizontalAlignment="Stretch"
                       Header="Expander Example 2b">
                     <StackPanel Orientation="Vertical"
                             TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
-                            Margin="16">
+                            Margin="24,8,24,16">
                         <TextBlock Text="Your Content" />
                         <TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
                                TextWrapping="Wrap"/>
                     </StackPanel>
                 </Expander>
+                <Border Background="{DynamicResource MaterialDesignDivider}" Height="1" HorizontalAlignment="Stretch" SnapsToDevicePixels="True" />
                 <Expander HorizontalAlignment="Stretch"
                       Header="Expander Example 2c">
                     <StackPanel Orientation="Vertical"
                             TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
-                            Margin="16">
+                            Margin="24,8,24,16">
                         <TextBlock Text="Your Content" />
                         <TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
                                TextWrapping="Wrap"/>
@@ -94,13 +96,14 @@
                 </Expander.Header>
                 <StackPanel Orientation="Vertical"
                             TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
-                            Margin="16">
+                            Margin="8,24,16,24">
                     <TextBlock Text="Your Content" />
                     <TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
                                MaxWidth="180"
                                TextWrapping="Wrap"/>
                 </StackPanel>
             </Expander>
+            <Border Background="{DynamicResource MaterialDesignDivider}" Width="1" VerticalAlignment="Stretch" SnapsToDevicePixels="True" />
             <Expander ExpandDirection="Right">
                 <Expander.Header>
                     <TextBlock Text="Expander Example 3b" RenderTransformOrigin=".5,.5">
@@ -111,13 +114,14 @@
                 </Expander.Header>
                 <StackPanel Orientation="Vertical"
                             TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
-                            Margin="16">
+                            Margin="8,24,16,24">
                     <TextBlock Text="Your Content" />
                     <TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
                                MaxWidth="180"
                                TextWrapping="Wrap"/>
                 </StackPanel>
             </Expander>
+            <Border Background="{DynamicResource MaterialDesignDivider}" Width="1" VerticalAlignment="Stretch" SnapsToDevicePixels="True" />
             <Expander ExpandDirection="Right">
                 <Expander.Header>
                     <TextBlock Text="Expander Example 3c" RenderTransformOrigin=".5,.5">
@@ -128,7 +132,7 @@
                 </Expander.Header>
                 <StackPanel Orientation="Vertical"
                             TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
-                            Margin="16">
+                            Margin="8,24,16,24">
                     <TextBlock Text="Your Content" />
                     <TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
                                MaxWidth="180"
diff --git a/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj b/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
index 4bab639092..3ae7daebe3 100644
--- a/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
+++ b/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
@@ -61,6 +61,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Project="..\.paket\paket.targets" />
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
       <ItemGroup>
@@ -73,7 +74,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
         <Reference Include="xunit.abstractions">
           <HintPath>..\packages\xunit.abstractions\lib\net35\xunit.abstractions.dll</HintPath>
@@ -84,7 +85,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
         <Reference Include="xunit.assert">
           <HintPath>..\packages\xunit.assert\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath>
@@ -95,7 +96,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
         <Reference Include="xunit.core">
           <HintPath>..\packages\xunit.extensibility.core\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath>
@@ -106,7 +107,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
         <Reference Include="xunit.execution.desktop">
           <HintPath>..\packages\xunit.extensibility.execution\lib\net45\xunit.execution.desktop.dll</HintPath>
@@ -116,5 +117,4 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\.paket\paket.targets" />
 </Project>
\ No newline at end of file
diff --git a/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj b/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj
index 1d95067173..f814f8148c 100644
--- a/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj
+++ b/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj
@@ -116,8 +116,9 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Project="..\.paket\paket.targets" />
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
         <Reference Include="MahApps.Metro">
           <HintPath>..\packages\MahApps.Metro\lib\net45\MahApps.Metro.dll</HintPath>
@@ -132,5 +133,4 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\.paket\paket.targets" />
 </Project>
\ No newline at end of file
diff --git a/MaterialDesignThemes.MahApps/Properties/AssemblyInfo.cs b/MaterialDesignThemes.MahApps/Properties/AssemblyInfo.cs
index 44964e9536..366e523ea3 100644
--- a/MaterialDesignThemes.MahApps/Properties/AssemblyInfo.cs
+++ b/MaterialDesignThemes.MahApps/Properties/AssemblyInfo.cs
@@ -3,6 +3,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
+using System.Windows.Markup;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -12,7 +13,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("MaterialDesignThemes.MahApps")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyCopyright("Copyright © 2015-2016 James Willock, Mulholland Software & Contributors")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +52,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.6")]
-[assembly: AssemblyFileVersion("0.0.6")]
+[assembly: AssemblyVersion("0.0.7")]
+[assembly: AssemblyFileVersion("0.0.7")]
+[assembly: XmlnsPrefix("http://materialdesigninxaml.net/winfx/xaml/themes", "materialDesignMahApps")]
+[assembly: XmlnsDefinition("http://materialdesigninxaml.net/winfx/xaml/themes", "MaterialDesignThemes.MahApps")]
diff --git a/MaterialDesignThemes.MahApps/Themes/MaterialDesignTheme.MahApps.Flyout.xaml b/MaterialDesignThemes.MahApps/Themes/MaterialDesignTheme.MahApps.Flyout.xaml
index 7570669b16..44c0675cda 100644
--- a/MaterialDesignThemes.MahApps/Themes/MaterialDesignTheme.MahApps.Flyout.xaml
+++ b/MaterialDesignThemes.MahApps/Themes/MaterialDesignTheme.MahApps.Flyout.xaml
@@ -1,54 +1,51 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-                    xmlns:Actions="clr-namespace:MahApps.Metro.Actions;assembly=MahApps.Metro"
                     xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf;assembly=MaterialDesignThemes.Wpf"
                     xmlns:mahApps="clr-namespace:MaterialDesignThemes.MahApps">
 
     <DataTemplate x:Key="HeaderTemplate"
                   x:Shared="False">
-        <wpf:ColorZone 
-            Mode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mahApps:FlyoutAssist.HeaderColorMode)}"
-            wpf:ShadowAssist.ShadowDepth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mahApps:FlyoutAssist.HeaderShadowDepth)}">
+        <wpf:ColorZone Mode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mahApps:FlyoutAssist.HeaderColorMode)}"
+                       wpf:ShadowAssist.ShadowDepth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mahApps:FlyoutAssist.HeaderShadowDepth)}">
             <DockPanel x:Name="dpHeader"
-                       Margin="10,25,10,10"
+                       Margin="{Binding Path=(Controls:ControlsHelper.HeaderMargin), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Mode=OneWay}"
                        VerticalAlignment="Center"
                        LastChildFill="True">
-                <Button x:Name="nav"
-                        Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=CloseCommand, Mode=OneWay}"
+                <Button x:Name="PART_BackButton"
+                        Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=InternalCloseCommand, Mode=OneWay}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=CloseCommandParameter, Mode=OneWay}"
                         DockPanel.Dock="Left"
                         Style="{DynamicResource MaterialDesignToolButton}"
+                        IsCancel="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=CloseButtonIsCancel}"
                         Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=CloseButtonVisibility}"
                         Height="40"
                         Width="40"
                         FontSize="16"
                         VerticalAlignment="Bottom">
-                    <i:Interaction.Triggers>
-                        <i:EventTrigger EventName="Click">
-                            <Actions:SetFlyoutOpenAction TargetObject="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}}"
-                                                         Value="False" />
-                        </i:EventTrigger>
-                    </i:Interaction.Triggers>
-                    <Viewbox Width="24" Height="24" RenderTransformOrigin="0.5,0.5">
+                    <Viewbox Width="24"
+                             Height="24"
+                             RenderTransformOrigin="0.5,0.5">
                         <Viewbox.RenderTransform>
                             <TransformGroup>
-                                <ScaleTransform ScaleY="1" ScaleX="-1"/>
-                                <SkewTransform AngleY="0" AngleX="0"/>
-                                <RotateTransform Angle="0"/>
-                                <TranslateTransform/>
+                                <ScaleTransform ScaleY="1"
+                                                ScaleX="-1" />
+                                <SkewTransform AngleY="0"
+                                               AngleX="0" />
+                                <RotateTransform Angle="0" />
+                                <TranslateTransform />
                             </TransformGroup>
                         </Viewbox.RenderTransform>
-                        <Canvas Width="24" Height="24">
-                            <Path Data="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" 
+                        <Canvas Width="24"
+                                Height="24">
+                            <Path Data="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z"
                                   Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:ColorZone}, Path=Foreground}" />
                         </Canvas>
                     </Viewbox>
                 </Button>
                 <TextBlock Text="{Binding}"
-                           x:Name="PART_BackButton"
+                           x:Name="PART_BackHeaderText"
                            Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=TitleVisibility}"
-                           FontSize="{StaticResource FlyoutHeaderFontSize}"
                            Margin="15,0,0,0"
                            VerticalAlignment="Center" />
             </DockPanel>
@@ -56,16 +53,16 @@
         <DataTemplate.Triggers>
             <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}}"
                          Value="Left">
-                <Setter TargetName="nav"
-                        Property="DockPanel.Dock"
+                <Setter TargetName="PART_BackHeaderText"
+                        Property="Margin"
+                        Value="0 0 15 0" />
+                <Setter TargetName="PART_BackHeaderText"
+                        Property="TextAlignment"
                         Value="Right" />
                 <Setter TargetName="PART_BackButton"
-                        Property="TextAlignment"
+                        Property="DockPanel.Dock"
                         Value="Right" />
                 <Setter TargetName="PART_BackButton"
-                        Property="Margin"
-                        Value="0,0,15,0" />
-                <Setter TargetName="nav"
                         Property="LayoutTransform">
                     <Setter.Value>
                         <ScaleTransform ScaleX="-1" />
@@ -74,10 +71,7 @@
             </DataTrigger>
             <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}}"
                          Value="Top">
-                <Setter TargetName="dpHeader"
-                        Property="Margin"
-                        Value="10" />
-                <Setter TargetName="nav"
+                <Setter TargetName="PART_BackButton"
                         Property="LayoutTransform">
                     <Setter.Value>
                         <RotateTransform Angle="-90" />
@@ -86,10 +80,7 @@
             </DataTrigger>
             <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}}"
                          Value="Bottom">
-                <Setter TargetName="dpHeader"
-                        Property="Margin"
-                        Value="10" />
-                <Setter TargetName="nav"
+                <Setter TargetName="PART_BackButton"
                         Property="LayoutTransform">
                     <Setter.Value>
                         <RotateTransform Angle="90" />
@@ -101,8 +92,9 @@
 
     <ControlTemplate x:Key="FlyoutTemplate"
                      TargetType="{x:Type Controls:Flyout}">
-        <Grid x:Name="root"
-              Margin="{TemplateBinding Margin}">
+        <Grid x:Name="PART_Root"
+              Margin="{TemplateBinding Margin}"
+              Background="{TemplateBinding Background}">
             <Grid.RenderTransform>
                 <TranslateTransform />
             </Grid.RenderTransform>
@@ -113,7 +105,7 @@
                         <Storyboard x:Name="HideStoryboard">
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
-                                                           Storyboard.TargetName="root">
+                                                           Storyboard.TargetName="PART_Root">
                                 <SplineDoubleKeyFrame KeyTime="00:00:00.750"
                                                       KeySpline="0.25,1,0.05,1"
                                                       Value="0"
@@ -121,7 +113,7 @@
                             </DoubleAnimationUsingKeyFrames>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
-                                                           Storyboard.TargetName="root">
+                                                           Storyboard.TargetName="PART_Root">
                                 <SplineDoubleKeyFrame KeyTime="00:00:00.750"
                                                       KeySpline="0.25,1,0.05,1"
                                                       Value="0"
@@ -129,19 +121,26 @@
                             </DoubleAnimationUsingKeyFrames>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
                                                            Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                           Storyboard.TargetName="root">
+                                                           Storyboard.TargetName="PART_Root">
                                 <SplineDoubleKeyFrame KeyTime="00:00:00.750"
                                                       KeySpline="0.25,1,0.05,1"
                                                       Value="0"
                                                       x:Name="fadeOutFrame" />
                             </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                           Storyboard.TargetProperty="(UIElement.Opacity)"
+                                                           Storyboard.TargetName="PART_Border">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.750"
+                                                      KeySpline="0.25,1,0.05,1"
+                                                      Value="0" />
+                            </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>
                     <VisualState x:Name="Show">
                         <Storyboard>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
-                                                           Storyboard.TargetName="root">
+                                                           Storyboard.TargetName="PART_Root">
                                 <SplineDoubleKeyFrame KeyTime="00:00:00.750"
                                                       KeySpline="0.25,1,0.05,1"
                                                       Value="0"
@@ -149,7 +148,7 @@
                             </DoubleAnimationUsingKeyFrames>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
-                                                           Storyboard.TargetName="root">
+                                                           Storyboard.TargetName="PART_Root">
                                 <SplineDoubleKeyFrame KeyTime="00:00:00.750"
                                                       KeySpline="0.25,1,0.05,1"
                                                       Value="0"
@@ -157,7 +156,7 @@
                             </DoubleAnimationUsingKeyFrames>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
                                                            Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                           Storyboard.TargetName="root">
+                                                           Storyboard.TargetName="PART_Root">
                                 <SplineDoubleKeyFrame KeyTime="00:00:00.750"
                                                       KeySpline="0.25,1,0.05,1"
                                                       Value="1" />
@@ -168,19 +167,19 @@
                         <Storyboard>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
-                                                           Storyboard.TargetName="root">
+                                                           Storyboard.TargetName="PART_Root">
                                 <SplineDoubleKeyFrame KeyTime="0"
                                                       Value="0" />
                             </DoubleAnimationUsingKeyFrames>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
-                                                           Storyboard.TargetName="root">
+                                                           Storyboard.TargetName="PART_Root">
                                 <SplineDoubleKeyFrame KeyTime="0"
                                                       Value="0" />
                             </DoubleAnimationUsingKeyFrames>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
                                                            Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                           Storyboard.TargetName="root">
+                                                           Storyboard.TargetName="PART_Root">
                                 <SplineDoubleKeyFrame KeyTime="0"
                                                       Value="0" />
                             </DoubleAnimationUsingKeyFrames>
@@ -190,19 +189,19 @@
                         <Storyboard>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
-                                                           Storyboard.TargetName="root">
+                                                           Storyboard.TargetName="PART_Root">
                                 <SplineDoubleKeyFrame KeyTime="0"
                                                       Value="0" />
                             </DoubleAnimationUsingKeyFrames>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
-                                                           Storyboard.TargetName="root">
+                                                           Storyboard.TargetName="PART_Root">
                                 <SplineDoubleKeyFrame KeyTime="0"
                                                       Value="0" />
                             </DoubleAnimationUsingKeyFrames>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
                                                            Storyboard.TargetProperty="(UIElement.Opacity)"
-                                                           Storyboard.TargetName="root">
+                                                           Storyboard.TargetName="PART_Root">
                                 <SplineDoubleKeyFrame KeyTime="0"
                                                       Value="1" />
                             </DoubleAnimationUsingKeyFrames>
@@ -210,43 +209,87 @@
                     </VisualState>
                 </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <AdornerDecorator>
+            <AdornerDecorator x:Name="PART_Border">
                 <AdornerDecorator.CacheMode>
-                    <BitmapCache EnableClearType="True" SnapsToDevicePixels="True"/>
+                    <BitmapCache EnableClearType="True"
+                                 SnapsToDevicePixels="False" />
                 </AdornerDecorator.CacheMode>
-                <Border Background="{TemplateBinding Background}" Effect="{DynamicResource MaterialDesignShadowDepth5}"/>
+                <Border Background="{TemplateBinding Background}"
+                        Effect="{DynamicResource MaterialDesignShadowDepth5}" />
             </AdornerDecorator>
             <AdornerDecorator>
                 <DockPanel FocusVisualStyle="{x:Null}"
                            Focusable="False">
-                    <ContentPresenter x:Name="PART_Header"
-                                      DockPanel.Dock="Top"
-                                      ContentSource="Header"
-                                      ContentTemplate="{TemplateBinding HeaderTemplate}" />
-                    <ContentPresenter x:Name="PART_Content"
-                                      DockPanel.Dock="Bottom" />
+                    <Controls:MetroThumbContentControl x:Name="PART_Header"
+                                                       DockPanel.Dock="Top"
+                                                       FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
+                                                       FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
+                                                       FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
+                                                       Content="{TemplateBinding Header}"
+                                                       ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
+                                                       RecognizesAccessKey="True"
+                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    <Grid x:Name="PART_TitleThumbContent"
+                          DockPanel.Dock="Bottom">
+                        <ContentPresenter x:Name="PART_Content"
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Controls:MetroThumb x:Name="PART_WindowTitleThumb"
+                                             Height="{Binding Path=TitlebarHeight, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}}"
+                                             VerticalAlignment="Top"
+                                             Style="{DynamicResource WindowTitleThumbStyle}"
+                                             Visibility="Collapsed" />
+                    </Grid>
                 </DockPanel>
             </AdornerDecorator>
         </Grid>
         <ControlTemplate.Triggers>
-            <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource Self}}"
-                         Value="Top">
+            <Trigger Property="Position"
+                     Value="Top">
+                <Setter TargetName="PART_TitleThumbContent"
+                        Property="DockPanel.Dock"
+                        Value="Right" />
                 <Setter TargetName="PART_Header"
                         Property="DockPanel.Dock"
                         Value="Left" />
-                <Setter TargetName="PART_Content"
+                <Setter TargetName="PART_WindowTitleThumb"
+                        Property="Visibility"
+                        Value="Visible" />
+            </Trigger>
+            <Trigger Property="Position"
+                     Value="Bottom">
+                <Setter TargetName="PART_TitleThumbContent"
                         Property="DockPanel.Dock"
                         Value="Right" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource Self}}"
-                         Value="Bottom">
                 <Setter TargetName="PART_Header"
                         Property="DockPanel.Dock"
                         Value="Left" />
-                <Setter TargetName="PART_Content"
-                        Property="DockPanel.Dock"
-                        Value="Right" />
-            </DataTrigger>
+                <Setter TargetName="PART_WindowTitleThumb"
+                        Property="Visibility"
+                        Value="Collapsed" />
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="CloseButtonVisibility"
+                               Value="Collapsed" />
+                    <Condition Property="TitleVisibility"
+                               Value="Collapsed" />
+                </MultiTrigger.Conditions>
+                <Setter TargetName="PART_Header"
+                        Property="Visibility"
+                        Value="Collapsed" />
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="CloseButtonVisibility"
+                               Value="Hidden" />
+                    <Condition Property="TitleVisibility"
+                               Value="Hidden" />
+                </MultiTrigger.Conditions>
+                <Setter TargetName="PART_Header"
+                        Property="Visibility"
+                        Value="Collapsed" />
+            </MultiTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
@@ -265,8 +308,12 @@
                 Value="Stretch" />
         <Setter Property="mahApps:FlyoutAssist.HeaderShadowDepth"
                 Value="Depth2" />
-        <Setter Property="mahApps:FlyoutAssist.HeaderColorMode" 
+        <Setter Property="mahApps:FlyoutAssist.HeaderColorMode"
                 Value="PrimaryMid" />
+        <Setter Property="Controls:ControlsHelper.HeaderFontSize"
+                Value="{DynamicResource FlyoutHeaderFontSize}" />
+        <Setter Property="Controls:ControlsHelper.HeaderMargin"
+                Value="10" />
         <Setter Property="HeaderTemplate"
                 Value="{StaticResource HeaderTemplate}" />
         <Setter Property="Template"
@@ -276,16 +323,32 @@
         <Setter Property="Foreground"
                 Value="{DynamicResource MaterialDesignBody}" />
         <Setter Property="Background"
-                Value="{DynamicResource MaterialDesignPaper}" />                
+                Value="{DynamicResource MaterialDesignPaper}" />
         <Style.Triggers>
-            <Trigger Property="TitleVisibility" Value="Collapsed">
-                <Setter Property="mahApps:FlyoutAssist.HeaderShadowDepth" Value="Depth0" />
-                <Setter Property="mahApps:FlyoutAssist.HeaderColorMode" Value="Standard" />
+            <Trigger Property="Position"
+                     Value="Right">
+                <Setter Property="Controls:ControlsHelper.HeaderMargin"
+                        Value="10 25 10 10" />
+            </Trigger>
+            <Trigger Property="Position"
+                     Value="Left">
+                <Setter Property="Controls:ControlsHelper.HeaderMargin"
+                        Value="10 25 10 10" />
+            </Trigger>
+            <Trigger Property="TitleVisibility"
+                     Value="Collapsed">
+                <Setter Property="mahApps:FlyoutAssist.HeaderShadowDepth"
+                        Value="Depth0" />
+                <Setter Property="mahApps:FlyoutAssist.HeaderColorMode"
+                        Value="Standard" />
             </Trigger>
-            <Trigger Property="TitleVisibility" Value="Hidden">
-                <Setter Property="mahApps:FlyoutAssist.HeaderShadowDepth" Value="Depth0" />
-                <Setter Property="mahApps:FlyoutAssist.HeaderColorMode" Value="Standard" />
+            <Trigger Property="TitleVisibility"
+                     Value="Hidden">
+                <Setter Property="mahApps:FlyoutAssist.HeaderShadowDepth"
+                        Value="Depth0" />
+                <Setter Property="mahApps:FlyoutAssist.HeaderColorMode"
+                        Value="Standard" />
             </Trigger>
         </Style.Triggers>
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj b/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
index 3b691501ea..7a8b68a6a3 100644
--- a/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
+++ b/MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
@@ -60,6 +60,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Project="..\.paket\paket.targets" />
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
       <ItemGroup>
@@ -116,7 +117,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
         <Reference Include="xunit.abstractions">
           <HintPath>..\packages\xunit.abstractions\lib\net35\xunit.abstractions.dll</HintPath>
@@ -127,7 +128,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
         <Reference Include="xunit.assert">
           <HintPath>..\packages\xunit.assert\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath>
@@ -138,7 +139,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
         <Reference Include="xunit.core">
           <HintPath>..\packages\xunit.extensibility.core\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath>
@@ -149,7 +150,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
         <Reference Include="xunit.execution.desktop">
           <HintPath>..\packages\xunit.extensibility.execution\lib\net45\xunit.execution.desktop.dll</HintPath>
@@ -159,5 +160,4 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\.paket\paket.targets" />
 </Project>
\ No newline at end of file
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml
index 2c48efe620..3655e81364 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml
@@ -114,7 +114,7 @@
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Fill" TargetName="Graphic" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
-                            <Setter TargetName="contentPresenter" Property="Opacity" Value="0.79"/>
+                            <Setter Property="Opacity" Value="0.26"/>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true"/>
                         <Trigger Property="IsChecked" Value="true">
@@ -213,7 +213,7 @@
                             <Setter Property="Padding" Value="4,2,0,0"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Opacity" TargetName="Graphic" Value=".56" />
+                            <Setter Property="Opacity" TargetName="Graphic" Value=".26" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true"/>
                         <Trigger Property="IsChecked" Value="true">
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml
index fded5316c3..7b0b8a329c 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml
@@ -93,28 +93,28 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <ToggleButton Grid.Row="0"
-                                      Margin="0 16 0 16"
+                    <Border Background="{TemplateBinding Background}" Padding="12,24,12,24">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <ToggleButton Grid.Row="0"
                                       HorizontalAlignment="Center"
                                       Foreground="{TemplateBinding Foreground}"
                                       IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                       Style="{StaticResource MaterialDesignExpanderToggleButton}"
                                       RenderTransformOrigin="0.5,0.5">
-                            <ToggleButton.RenderTransform>
-                                <RotateTransform Angle="-90"/>
-                            </ToggleButton.RenderTransform>
-                        </ToggleButton>
-                        <ContentPresenter Grid.Row="1"
+                                <ToggleButton.RenderTransform>
+                                    <RotateTransform Angle="-90"/>
+                                </ToggleButton.RenderTransform>
+                            </ToggleButton>
+                            <ContentPresenter Grid.Row="1"
                                           HorizontalAlignment="Center"
-                                          Margin="16 16 16 0"
+                                          Margin="0,16,0,0"
                                           Content="{TemplateBinding Content}" VerticalAlignment="Top" />
-                        <Border BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 1 0" Grid.RowSpan="2" />
-                    </Grid>
+                        </Grid>
+                    </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -127,28 +127,28 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <ToggleButton Grid.Row="0"
-                                      Margin="0 16 0 16"
+                    <Border Background="{TemplateBinding Background}" Padding="12,24,12,24">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <ToggleButton Grid.Row="0"
                                       HorizontalAlignment="Center"
                                       Foreground="{TemplateBinding Foreground}"
                                       IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                       Style="{StaticResource MaterialDesignExpanderToggleButton}"
                                       RenderTransformOrigin="0.5,0.5">
-                            <ToggleButton.RenderTransform>
-                                <RotateTransform Angle="90"/>
-                            </ToggleButton.RenderTransform>
-                        </ToggleButton>
-                        <ContentPresenter Grid.Row="1"
+                                <ToggleButton.RenderTransform>
+                                    <RotateTransform Angle="90"/>
+                                </ToggleButton.RenderTransform>
+                            </ToggleButton>
+                            <ContentPresenter Grid.Row="1"
                                           HorizontalAlignment="Center"
-                                          Margin="16 16 16 0"
+                                          Margin="0,16,0,0"
                                           Content="{TemplateBinding Content}" VerticalAlignment="Top" />
-                        <Border BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="1 0 0 0" Grid.RowSpan="2" />
-                    </Grid>
+                        </Grid>
+                    </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -161,25 +161,25 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <ContentPresenter Content="{TemplateBinding Content}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                    <Border Background="{TemplateBinding Background}" Padding="24,12,24,12">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter Content="{TemplateBinding Content}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                              VerticalAlignment="Center"
+                                              Margin="0,0,16,0" />
+                            <ToggleButton Grid.Column="1"
                                           VerticalAlignment="Center"
-                                          Margin="16 16 0 16" />                        
-                        <ToggleButton Grid.Column="1"
-                                      Margin="16 0 16 0"
-                                      VerticalAlignment="Center"
-                                      Foreground="{TemplateBinding Foreground}"
-                                      IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Style="{StaticResource MaterialDesignExpanderToggleButton}"/>
-                        <Border BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 0 1" Grid.ColumnSpan="2" SnapsToDevicePixels="True" />
-                    </Grid>
+                                          Foreground="{TemplateBinding Foreground}"
+                                          IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                          Style="{StaticResource MaterialDesignExpanderToggleButton}"/>
+                        </Grid>
+                    </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -192,27 +192,27 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <ContentPresenter VerticalAlignment="Center"
+                    <Border Background="{TemplateBinding Background}" Padding="24,12,24,12">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter VerticalAlignment="Center"
                                           Content="{TemplateBinding Content}"
-                                          Margin="16 16 0 16" />
-                        <ToggleButton IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                          Margin="16 0 16 0"
+                                          Margin="0,0,16,0" />
+                            <ToggleButton IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                           VerticalAlignment="Center"
                                           Foreground="{TemplateBinding Foreground}"
                                           Style="{StaticResource MaterialDesignExpanderToggleButton}"
                                           RenderTransformOrigin="0.5,0.5"
                                           Grid.Column="1">
-                            <ToggleButton.RenderTransform>
-                                <RotateTransform Angle="-180"/>
-                            </ToggleButton.RenderTransform>
-                        </ToggleButton>
-                        <Border BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 0 1" Grid.ColumnSpan="2" />
-                    </Grid>
+                                <ToggleButton.RenderTransform>
+                                    <RotateTransform Angle="-180"/>
+                                </ToggleButton.RenderTransform>
+                            </ToggleButton>
+                        </Grid>
+                    </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -271,7 +271,7 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <DockPanel>
+                        <DockPanel Background="{TemplateBinding Background}">
                             <ToggleButton Name="HeaderSite"
                                           DockPanel.Dock="Top"
                                           BorderThickness="0" Cursor="Hand"
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml
index 09a663b8ec..0561a95db1 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml
@@ -85,7 +85,7 @@
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
                             <Setter Property="Fill" TargetName="Graphic" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
-                            <Setter TargetName="contentPresenter" Property="Opacity" Value="0.79"/>
+                            <Setter Property="Opacity" Value="0.26"/>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true"/>
                         <Trigger Property="IsChecked" Value="true">
diff --git a/MaterialDesignThemes.Wpf/Transitions/TransitioningContent.cs b/MaterialDesignThemes.Wpf/Transitions/TransitioningContent.cs
index 723ed32d4a..a508c603f1 100644
--- a/MaterialDesignThemes.Wpf/Transitions/TransitioningContent.cs
+++ b/MaterialDesignThemes.Wpf/Transitions/TransitioningContent.cs
@@ -26,6 +26,7 @@ public TransitioningContent()
         {
             Loaded += (sender, args) => Run(TransitioningContentRunHint.Loaded);
             IsVisibleChanged += (sender, args) => Run(TransitioningContentRunHint.IsVisibleChanged);
+            
         }
 
         public static readonly DependencyProperty RunHintProperty = DependencyProperty.Register(
diff --git a/MaterialDesignThemes.Wpf/Transitions/TransitioningContentBase.cs b/MaterialDesignThemes.Wpf/Transitions/TransitioningContentBase.cs
index caa005d0ef..3a0adcc1e5 100644
--- a/MaterialDesignThemes.Wpf/Transitions/TransitioningContentBase.cs
+++ b/MaterialDesignThemes.Wpf/Transitions/TransitioningContentBase.cs
@@ -23,6 +23,8 @@ public class TransitioningContentBase : ContentControl, ITransitionEffectSubject
         private SkewTransform _skewTransform;
         private TranslateTransform _translateTransform;
 
+        private bool _isOpeningEffectPending = false;
+
         static TransitioningContentBase()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof (TransitioningContentBase), new FrameworkPropertyMetadata(typeof (TransitioningContentBase)));
@@ -51,9 +53,11 @@ public override void OnApplyTemplate()
             if (_skewTransform != null)
                 RegisterName(SkewTransformPartName, _skewTransform);
             if (_translateTransform != null)
-                RegisterName(TranslateTransformPartName, _translateTransform);
+                RegisterName(TranslateTransformPartName, _translateTransform);            
 
             base.OnApplyTemplate();
+
+            RunOpeningEffects();
         }
 
         private void UnregisterNames(params string[] names)
@@ -107,7 +111,12 @@ public TimeSpan OpeningEffectsOffset
 
         protected virtual void RunOpeningEffects()
         {
-            if (!IsLoaded) return;
+            if (!IsLoaded || _matrixTransform == null)
+            {
+                _isOpeningEffectPending = true;
+                return;
+            }
+            _isOpeningEffectPending = false;
 
             var storyboard = new Storyboard();
             var openingEffect = OpeningEffect?.Build(this);
diff --git a/paket.dependencies b/paket.dependencies
index 55befb9a91..499138805b 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -1,7 +1,7 @@
 source https://nuget.org/api/v2
 framework >= net45
 
-nuget MahApps.Metro ~> 1.2.4
+nuget MahApps.Metro ~> 1.3
 nuget Dragablz 0.0.3.165
 nuget Moq 4.5.10 framework: = net452
 nuget NSubstitute 1.10.0 framework: = net452
diff --git a/paket.lock b/paket.lock
index 140e3b066f..55423b9839 100644
--- a/paket.lock
+++ b/paket.lock
@@ -3,7 +3,7 @@ NUGET
   remote: https://www.nuget.org/api/v2
     Castle.Core (3.3.3) - framework: net452
     Dragablz (0.0.3.165)
-    MahApps.Metro (1.2.4)
+    MahApps.Metro (1.3)
     Moq (4.5.10) - framework: net452
       Castle.Core (>= 3.3.3)
     NSubstitute (1.10) - framework: net452