diff --git a/MainDemo.Wpf/Domain/MainWindowViewModel.cs b/MainDemo.Wpf/Domain/MainWindowViewModel.cs
index 9ed41accc1..f23bf43725 100644
--- a/MainDemo.Wpf/Domain/MainWindowViewModel.cs
+++ b/MainDemo.Wpf/Domain/MainWindowViewModel.cs
@@ -286,6 +286,15 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
                     DocumentationLink.StyleLink("ListView")
                 });
 
+            yield return new DemoItem(
+                "Tabs",
+                typeof(Tabs),
+                new[]
+                {
+                    DocumentationLink.DemoPageLink<Tabs>(),
+                    DocumentationLink.StyleLink("TabControl")
+                });
+
             yield return new DemoItem(
                 "Trees",
                 typeof(Trees),
diff --git a/MainDemo.Wpf/Tabs.xaml b/MainDemo.Wpf/Tabs.xaml
new file mode 100644
index 0000000000..938edf0403
--- /dev/null
+++ b/MainDemo.Wpf/Tabs.xaml
@@ -0,0 +1,382 @@
+<UserControl
+    x:Class="MaterialDesignDemo.Tabs"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
+    d:DesignHeight="4000"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
+    <StackPanel Margin="0,0,8,8">
+        <TextBlock
+            Margin="0,0,0,16"
+            Style="{StaticResource MaterialDesignHeadline4TextBlock}"
+            Text="Tabs" />
+
+        <TextBlock
+            Margin="0,0,0,8"
+            Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+            Text="Default style" />
+
+        <WrapPanel Margin="0,0,0,16">
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_1">
+                <materialDesign:Card>
+                    <TabControl Width="300" materialDesign:ColorZoneAssist.Mode="PrimaryLight">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="PrimaryLight Tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="PrimaryLight Tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_2">
+                <materialDesign:Card>
+                    <TabControl Width="300" materialDesign:ColorZoneAssist.Mode="PrimaryMid">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="PrimaryMid Tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="PrimaryMid Tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_3">
+                <materialDesign:Card>
+                    <TabControl Width="300" materialDesign:ColorZoneAssist.Mode="PrimaryDark">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="PrimaryDark Tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="PrimaryDark Tab 2" />
+                        </TabItem>
+                    </TabControl>
+
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+        </WrapPanel>
+
+        <WrapPanel Margin="0,0,0,16">
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_4">
+                <materialDesign:Card>
+                    <TabControl Width="300" materialDesign:ColorZoneAssist.Mode="SecondaryLight">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="SecondaryLight Tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="SecondaryLight Tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_5">
+                <materialDesign:Card>
+                    <TabControl Width="300" materialDesign:ColorZoneAssist.Mode="SecondaryMid">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="SecondaryMid Tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="SecondaryMid Tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_6">
+                <materialDesign:Card>
+                    <TabControl Width="300" materialDesign:ColorZoneAssist.Mode="SecondaryDark">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="SecondaryDark Tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="SecondaryDark Tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+        </WrapPanel>
+
+        <TextBlock
+            Margin="0,0,0,8"
+            Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+            Text="Filled style" />
+
+        <WrapPanel Margin="0,0,0,16">
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_7">
+                <materialDesign:Card>
+                    <TabControl
+                        Width="300"
+                        materialDesign:ColorZoneAssist.Mode="PrimaryLight"
+                        Style="{StaticResource MaterialDesignFilledTabControl}">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="PrimaryLight Tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="PrimaryLight Tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_8">
+                <materialDesign:Card>
+                    <TabControl
+                        Width="300"
+                        materialDesign:ColorZoneAssist.Mode="PrimaryMid"
+                        Style="{StaticResource MaterialDesignFilledTabControl}">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="PrimaryMid Tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="PrimaryMid Tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_9">
+                <materialDesign:Card>
+                    <TabControl
+                        Width="300"
+                        materialDesign:ColorZoneAssist.Mode="PrimaryDark"
+                        Style="{StaticResource MaterialDesignFilledTabControl}">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="PrimaryDark Tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="PrimaryDark Tab 2" />
+                        </TabItem>
+                    </TabControl>
+
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+        </WrapPanel>
+
+        <WrapPanel Margin="0,0,0,16">
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_10">
+                <materialDesign:Card>
+                    <TabControl
+                        Width="300"
+                        materialDesign:ColorZoneAssist.Mode="SecondaryLight"
+                        Style="{StaticResource MaterialDesignFilledTabControl}">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="SecondaryLight Tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="SecondaryLight Tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_11">
+                <materialDesign:Card>
+                    <TabControl
+                        Width="300"
+                        materialDesign:ColorZoneAssist.Mode="SecondaryMid"
+                        Style="{StaticResource MaterialDesignFilledTabControl}">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="SecondaryMid Tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="SecondaryMid Tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_12">
+                <materialDesign:Card>
+                    <TabControl
+                        Width="300"
+                        materialDesign:ColorZoneAssist.Mode="SecondaryDark"
+                        Style="{StaticResource MaterialDesignFilledTabControl}">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="SecondaryDark Tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="SecondaryDark Tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+        </WrapPanel>
+
+        <TextBlock
+            Margin="0,0,0,8"
+            Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+            Text="Placement" />
+
+        <WrapPanel>
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_13">
+                <materialDesign:Card>
+                    <TabControl
+                        Width="300"
+                        Height="150"
+                        TabStripPlacement="Left">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="Left placement" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="Left placement" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_14">
+                <materialDesign:Card>
+                    <TabControl
+                        Width="300"
+                        Height="150"
+                        TabStripPlacement="Right">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="Right placement tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="Right placement tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_15">
+                <materialDesign:Card>
+                    <TabControl
+                        Width="300"
+                        Height="150"
+                        TabStripPlacement="Bottom">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="Bottom placement tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="Bottom placement tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+        </WrapPanel>
+
+        <WrapPanel>
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_16">
+                <materialDesign:Card>
+                    <TabControl
+                        Width="300"
+                        Height="150"
+                        Style="{StaticResource MaterialDesignFilledTabControl}"
+                        TabStripPlacement="Left">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="Left placement" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="Left placement" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_17">
+                <materialDesign:Card>
+                    <TabControl
+                        Width="300"
+                        Height="150"
+                        Style="{StaticResource MaterialDesignFilledTabControl}"
+                        TabStripPlacement="Right">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="Right placement tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="Right placement tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_18">
+                <materialDesign:Card>
+                    <TabControl
+                        Width="300"
+                        Height="150"
+                        Style="{StaticResource MaterialDesignFilledTabControl}"
+                        TabStripPlacement="Bottom">
+                        <TabItem Header="TAB 1">
+                            <TextBlock Margin="8" Text="Bottom placement tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="Bottom placement tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+        </WrapPanel>
+
+        <TextBlock
+            Margin="0,0,0,8"
+            Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+            Text="Different sizes" />
+
+        <StackPanel>
+            <smtx:XamlDisplay Margin="0,0,0,16" UniqueKey="tabs_19">
+                <materialDesign:Card>
+                    <TabControl HorizontalContentAlignment="Left">
+                        <TabItem Header="TAB1">
+                            <TextBlock Margin="8" Text="Full-width example tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="Full-width example tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,0,16" UniqueKey="tabs_20">
+                <materialDesign:Card>
+                    <TabControl HorizontalContentAlignment="Left" Style="{StaticResource MaterialDesignFilledTabControl}">
+                        <TabItem Header="TAB1">
+                            <TextBlock Margin="8" Text="Full-width filled example tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="Full-width filled example tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,0,16" UniqueKey="tabs_21">
+                <materialDesign:Card>
+                    <TabControl HorizontalContentAlignment="Left" materialDesign:ColorZoneAssist.Mode="SecondaryMid">
+                        <TabItem Header="TAB1">
+                            <TextBlock Margin="8" Text="Full-width secondary example tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="Full-width secondary example tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay Margin="0,0,0,16" UniqueKey="tabs_22">
+                <materialDesign:Card>
+                    <TabControl
+                        HorizontalContentAlignment="Left"
+                        materialDesign:ColorZoneAssist.Mode="SecondaryMid"
+                        Style="{StaticResource MaterialDesignFilledTabControl}">
+                        <TabItem Header="TAB1">
+                            <TextBlock Margin="8" Text="Full-width secondary filled example tab 1" />
+                        </TabItem>
+                        <TabItem Header="TAB 2">
+                            <TextBlock Margin="8" Text="Full-width secondary filled example tab 2" />
+                        </TabItem>
+                    </TabControl>
+                </materialDesign:Card>
+            </smtx:XamlDisplay>
+        </StackPanel>
+    </StackPanel>
+</UserControl>
diff --git a/MainDemo.Wpf/Tabs.xaml.cs b/MainDemo.Wpf/Tabs.xaml.cs
new file mode 100644
index 0000000000..29b12473f6
--- /dev/null
+++ b/MainDemo.Wpf/Tabs.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace MaterialDesignDemo
+{
+    /// <summary>
+    /// Interaction logic for Tabs.xaml
+    /// </summary>
+    public partial class Tabs : UserControl
+    {
+        public Tabs()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml
index 27e95147d2..f022f89324 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml
@@ -81,6 +81,8 @@
     <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MaterialDesignScrollBar}" />
     <Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource MaterialDesignScrollViewer}" />
     <Style TargetType="{x:Type Slider}" BasedOn="{StaticResource MaterialDesignSlider}" />
+    <Style TargetType="{x:Type TabControl}" BasedOn="{StaticResource MaterialDesignTabControl}" />
+    <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource MaterialDesignTabItem}" />
     <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignTextBox}" />
     <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MaterialDesignSwitchToggleButton}" />
     <Style TargetType="{x:Type ToolBar}" BasedOn="{StaticResource MaterialDesignToolBar}" />
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml
index 1ff808b018..9dc4eeceb9 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml
@@ -83,6 +83,8 @@
     <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MaterialDesignScrollBar}" />
     <Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource MaterialDesignScrollViewer}" />
     <Style TargetType="{x:Type Slider}" BasedOn="{StaticResource MaterialDesignSlider}" />
+    <Style TargetType="{x:Type TabControl}" BasedOn="{StaticResource MaterialDesignTabControl}" />
+    <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource MaterialDesignTabItem}" />
     <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignTextBox}" />
     <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MaterialDesignSwitchToggleButton}" />
     <Style TargetType="{x:Type ToolBar}" BasedOn="{StaticResource MaterialDesignToolBar}" />
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml
index 27e95147d2..5ead0e4df2 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml
@@ -1,7 +1,6 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <!-- use this resource dictionary to set up the most common themese for standard controls -->
+    <!--  use this resource dictionary to set up the most common themese for standard controls  -->
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
@@ -43,59 +42,70 @@
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Window.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    
-    <SolidColorBrush x:Key="MaterialDesignLightBackground" Color="#FFFAFAFA"/>
-    <SolidColorBrush x:Key="MaterialDesignLightForeground" Color="#DD000000"/>
-    <SolidColorBrush x:Key="MaterialDesignDarkBackground" Color="#FF303030"/>
-    <SolidColorBrush x:Key="MaterialDesignDarkForeground" Color="#FFFAFAFA"/>
+
+    <SolidColorBrush x:Key="MaterialDesignLightBackground" Color="#FFFAFAFA" />
+    <SolidColorBrush x:Key="MaterialDesignLightForeground" Color="#DD000000" />
+    <SolidColorBrush x:Key="MaterialDesignDarkBackground" Color="#FF303030" />
+    <SolidColorBrush x:Key="MaterialDesignDarkForeground" Color="#FFFAFAFA" />
     <SolidColorBrush x:Key="MaterialDesignDarkSeparatorBackground" Color="#1F000000" />
     <SolidColorBrush x:Key="MaterialDesignLightSeparatorBackground" Color="#1FFFFFFF" />
-    
-    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignRaisedButton}" />
-    <Style TargetType="{x:Type Calendar}" BasedOn="{StaticResource MaterialDesignCalendarPortrait}" />
-    <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource MaterialDesignCheckBox}" />
-    <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource MaterialDesignComboBox}" />
-    <Style TargetType="{x:Type ContextMenu}" BasedOn="{StaticResource MaterialDesignContextMenu}" />
-    <Style TargetType="{x:Type Thumb}" BasedOn="{StaticResource MaterialDesignThumb}" />
-    <Style TargetType="{x:Type DataGrid}" BasedOn="{StaticResource MaterialDesignDataGrid}" />
-    <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}" />
-    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}" />
-    <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MaterialDesignDataGridRow}" />
-    <Style TargetType="{x:Type DataGridRowHeader}" BasedOn="{StaticResource MaterialDesignDataGridRowHeader}" />
-    <Style TargetType="{x:Type DatePicker}" BasedOn="{StaticResource MaterialDesignDatePicker}" />
-    <Style TargetType="{x:Type Expander}" BasedOn="{StaticResource MaterialDesignExpander}" />
-    <Style TargetType="{x:Type GridSplitter}" BasedOn="{StaticResource MaterialDesignGridSplitter}" />
-    <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource MaterialDesignGroupBox}" />
-    <Style TargetType="{x:Type Label}" BasedOn="{StaticResource MaterialDesignLabel}" />
-    <Style TargetType="{x:Type ListBox}" BasedOn="{StaticResource MaterialDesignListBox}" />
-    <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource MaterialDesignListBoxItem}" />
-    <Style TargetType="{x:Type ListView}" BasedOn="{StaticResource MaterialDesignListView}" />
-    <Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource MaterialDesignListBoxItem}" />
-    <Style TargetType="{x:Type Menu}" BasedOn="{StaticResource MaterialDesignMenu}" />
-    <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}" />
-    <Style TargetType="{x:Type PasswordBox}" BasedOn="{StaticResource MaterialDesignPasswordBox}" />
-    <Style TargetType="{x:Type ProgressBar}" BasedOn="{StaticResource MaterialDesignLinearProgressBar}" />
-    <Style TargetType="{x:Type RadioButton}" BasedOn="{StaticResource MaterialDesignRadioButton}" />
-    <Style TargetType="{x:Type RepeatButton}" BasedOn="{StaticResource MaterialDesignRaisedButton}" />
-    <Style TargetType="{x:Type RichTextBox}" BasedOn="{StaticResource MaterialDesignRichTextBox}" />
-    <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MaterialDesignScrollBar}" />
-    <Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource MaterialDesignScrollViewer}" />
-    <Style TargetType="{x:Type Slider}" BasedOn="{StaticResource MaterialDesignSlider}" />
-    <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignTextBox}" />
-    <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MaterialDesignSwitchToggleButton}" />
-    <Style TargetType="{x:Type ToolBar}" BasedOn="{StaticResource MaterialDesignToolBar}" />
-    <Style TargetType="{x:Type ToolBarTray}" BasedOn="{StaticResource MaterialDesignToolBarTray}" />
-    <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource MaterialDesignToolTip}" />
-    <Style TargetType="{x:Type TreeView}" BasedOn="{StaticResource MaterialDesignTreeView}" />
-    <Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource MaterialDesignTreeViewItem}" />
 
-    <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="{x:Type Separator}" BasedOn="{StaticResource MaterialDesignSeparator}" />
-    <Style x:Key="MaterialDesignDarkSeparator" TargetType="{x:Type Separator}" BasedOn="{StaticResource MaterialDesignSeparator}">
-        <Setter Property="Background" Value="{DynamicResource MaterialDesignDarkSeparatorBackground}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignDarkSeparatorBackground}"/>
+    <Style BasedOn="{StaticResource MaterialDesignRaisedButton}" TargetType="{x:Type Button}" />
+    <Style BasedOn="{StaticResource MaterialDesignCalendarPortrait}" TargetType="{x:Type Calendar}" />
+    <Style BasedOn="{StaticResource MaterialDesignCheckBox}" TargetType="{x:Type CheckBox}" />
+    <Style BasedOn="{StaticResource MaterialDesignComboBox}" TargetType="{x:Type ComboBox}" />
+    <Style BasedOn="{StaticResource MaterialDesignContextMenu}" TargetType="{x:Type ContextMenu}" />
+    <Style BasedOn="{StaticResource MaterialDesignThumb}" TargetType="{x:Type Thumb}" />
+    <Style BasedOn="{StaticResource MaterialDesignDataGrid}" TargetType="{x:Type DataGrid}" />
+    <Style BasedOn="{StaticResource MaterialDesignDataGridCell}" TargetType="{x:Type DataGridCell}" />
+    <Style BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}" TargetType="{x:Type DataGridColumnHeader}" />
+    <Style BasedOn="{StaticResource MaterialDesignDataGridRow}" TargetType="{x:Type DataGridRow}" />
+    <Style BasedOn="{StaticResource MaterialDesignDataGridRowHeader}" TargetType="{x:Type DataGridRowHeader}" />
+    <Style BasedOn="{StaticResource MaterialDesignDatePicker}" TargetType="{x:Type DatePicker}" />
+    <Style BasedOn="{StaticResource MaterialDesignExpander}" TargetType="{x:Type Expander}" />
+    <Style BasedOn="{StaticResource MaterialDesignGridSplitter}" TargetType="{x:Type GridSplitter}" />
+    <Style BasedOn="{StaticResource MaterialDesignGroupBox}" TargetType="{x:Type GroupBox}" />
+    <Style BasedOn="{StaticResource MaterialDesignLabel}" TargetType="{x:Type Label}" />
+    <Style BasedOn="{StaticResource MaterialDesignListBox}" TargetType="{x:Type ListBox}" />
+    <Style BasedOn="{StaticResource MaterialDesignListBoxItem}" TargetType="{x:Type ListBoxItem}" />
+    <Style BasedOn="{StaticResource MaterialDesignListView}" TargetType="{x:Type ListView}" />
+    <Style BasedOn="{StaticResource MaterialDesignListBoxItem}" TargetType="{x:Type ListViewItem}" />
+    <Style BasedOn="{StaticResource MaterialDesignMenu}" TargetType="{x:Type Menu}" />
+    <Style BasedOn="{StaticResource MaterialDesignMenuItem}" TargetType="{x:Type MenuItem}" />
+    <Style BasedOn="{StaticResource MaterialDesignPasswordBox}" TargetType="{x:Type PasswordBox}" />
+    <Style BasedOn="{StaticResource MaterialDesignLinearProgressBar}" TargetType="{x:Type ProgressBar}" />
+    <Style BasedOn="{StaticResource MaterialDesignRadioButton}" TargetType="{x:Type RadioButton}" />
+    <Style BasedOn="{StaticResource MaterialDesignRaisedButton}" TargetType="{x:Type RepeatButton}" />
+    <Style BasedOn="{StaticResource MaterialDesignRichTextBox}" TargetType="{x:Type RichTextBox}" />
+    <Style BasedOn="{StaticResource MaterialDesignScrollBar}" TargetType="{x:Type ScrollBar}" />
+    <Style BasedOn="{StaticResource MaterialDesignScrollViewer}" TargetType="{x:Type ScrollViewer}" />
+    <Style BasedOn="{StaticResource MaterialDesignSlider}" TargetType="{x:Type Slider}" />
+    <Style BasedOn="{StaticResource MaterialDesignTabControl}" TargetType="{x:Type TabControl}" />
+    <Style BasedOn="{StaticResource MaterialDesignTabItem}" TargetType="{x:Type TabItem}" />
+    <Style BasedOn="{StaticResource MaterialDesignTextBox}" TargetType="{x:Type TextBox}" />
+    <Style BasedOn="{StaticResource MaterialDesignSwitchToggleButton}" TargetType="{x:Type ToggleButton}" />
+    <Style BasedOn="{StaticResource MaterialDesignToolBar}" TargetType="{x:Type ToolBar}" />
+    <Style BasedOn="{StaticResource MaterialDesignToolBarTray}" TargetType="{x:Type ToolBarTray}" />
+    <Style BasedOn="{StaticResource MaterialDesignToolTip}" TargetType="{x:Type ToolTip}" />
+    <Style BasedOn="{StaticResource MaterialDesignTreeView}" TargetType="{x:Type TreeView}" />
+    <Style BasedOn="{StaticResource MaterialDesignTreeViewItem}" TargetType="{x:Type TreeViewItem}" />
+
+    <Style
+        x:Key="{x:Static MenuItem.SeparatorStyleKey}"
+        BasedOn="{StaticResource MaterialDesignSeparator}"
+        TargetType="{x:Type Separator}" />
+    <Style
+        x:Key="MaterialDesignDarkSeparator"
+        BasedOn="{StaticResource MaterialDesignSeparator}"
+        TargetType="{x:Type Separator}">
+        <Setter Property="Background" Value="{DynamicResource MaterialDesignDarkSeparatorBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignDarkSeparatorBackground}" />
     </Style>
-    <Style x:Key="MaterialDesignLightSeparator" TargetType="{x:Type Separator}" BasedOn="{StaticResource MaterialDesignSeparator}">
-        <Setter Property="Background" Value="{DynamicResource MaterialDesignLightSeparatorBackground}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignLightSeparatorBackground}"/>
+    <Style
+        x:Key="MaterialDesignLightSeparator"
+        BasedOn="{StaticResource MaterialDesignSeparator}"
+        TargetType="{x:Type Separator}">
+        <Setter Property="Background" Value="{DynamicResource MaterialDesignLightSeparatorBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignLightSeparatorBackground}" />
     </Style>
 </ResourceDictionary>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
index 11921a1874..d9ca75ebce 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
@@ -1,169 +1,284 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"
-                    xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
+    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary>
-            <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-            <converters:BorderClipConverter x:Key="BorderClipConverter"/>
-        </ResourceDictionary>
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBlock.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+    <converters:BorderClipConverter x:Key="BorderClipConverter" />
+
     <Style x:Key="FocusVisual">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                    <Rectangle
+                        Margin="2"
+                        SnapsToDevicePixels="true"
+                        Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                        StrokeDashArray="1 2"
+                        StrokeThickness="1" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-
-    <!--<Style  TargetType="{x:Type TabControl}" x:Key="MaterialDesignTabControl">
-        <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
-        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+    <Style x:Key="MaterialDesignTabControlBase" TargetType="{x:Type TabControl}">
+        <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource MaterialDesignFlatButtonRipple}" />
+        <Setter Property="wpf:ShadowAssist.ShadowDepth" Value="Depth3" />
+        <Setter Property="wpf:ColorZoneAssist.Mode" Value="PrimaryMid" />
+        <Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Bottom" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
                     <DockPanel KeyboardNavigation.TabNavigation="Local">
-                        <wpf:ColorZone x:Name="PART_ColorZone" 
-                                       DockPanel.Dock="Top"
-                                       Focusable="False"
-                                       Mode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Mode)}" 
-                                       wpf:ColorZoneAssist.Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Background)}"
-                                       wpf:ColorZoneAssist.Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Foreground)}" >
-                            <UniformGrid x:Name="HeaderPanel"
-                                         Rows="1"
-                                         IsItemsHost="True"
-                                         Focusable="False"
-                                         KeyboardNavigation.TabIndex="1"
-                                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-                        </wpf:ColorZone>
-                        <wpf:ColorZone x:Name="PART_ColorZoneSelectedContent" 
-                                       Padding="{TemplateBinding Padding}" 
-                                       VerticalAlignment="Stretch"
-                                       HorizontalAlignment="Stretch"
-                                       Mode="Standard" 
-                                       Focusable="False"
-                                       Foreground="{DynamicResource MaterialDesignBody}"
-                                       Background="{x:Null}">
-                            <ContentPresenter x:Name="PART_SelectedContentHost"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                                              Focusable="False"
-                                              Margin="{TemplateBinding Padding}"
-                                              TextElement.Foreground="{Binding ElementName=PART_ColorZone, Path=Foreground}"
-                                              TextBlock.Foreground="{Binding ElementName=PART_ColorZone, Path=Foreground}"
-                                              ContentSource="SelectedContent"
-                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}">
-                            </ContentPresenter>
-                        </wpf:ColorZone>
+                        <wpf:Card
+                            x:Name="PART_HeaderCard"
+                            VerticalAlignment="Stretch"
+                            wpf:ShadowAssist.ShadowDepth="{TemplateBinding wpf:ShadowAssist.ShadowDepth}"
+                            wpf:ShadowAssist.ShadowEdges="{TemplateBinding wpf:ShadowAssist.ShadowEdges}"
+                            DockPanel.Dock="Top"
+                            Focusable="False">
+                            <wpf:ColorZone
+                                VerticalAlignment="Stretch"
+                                Background="{TemplateBinding wpf:ColorZoneAssist.Background}"
+                                Focusable="False">
+
+                                <UniformGrid
+                                    x:Name="HeaderPanel"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="Top"
+                                    Focusable="False"
+                                    IsItemsHost="True"
+                                    KeyboardNavigation.TabIndex="1"
+                                    Rows="1" />
+                            </wpf:ColorZone>
+                        </wpf:Card>
+                        <Border
+                            x:Name="PART_BorderSelectedContent"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Background="{x:Null}"
+                            Focusable="False">
+                            <ContentPresenter
+                                x:Name="PART_SelectedContentHost"
+                                Margin="{TemplateBinding Padding}"
+                                ContentSource="SelectedContent"
+                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                Focusable="False"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                TextBlock.Foreground="{Binding ElementName=PART_HeaderCard, Path=Foreground}"
+                                TextElement.Foreground="{Binding ElementName=PART_HeaderCard, Path=Foreground}" />
+                        </Border>
                     </DockPanel>
 
                     <ControlTemplate.Triggers>
                         <Trigger Property="TabStripPlacement" Value="Bottom">
-                            <Setter TargetName="PART_ColorZone" Property="DockPanel.Dock" Value="Bottom"/>
+                            <Setter TargetName="PART_HeaderCard" Property="DockPanel.Dock" Value="Bottom" />
+                            <Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Top" />
                         </Trigger>
                         <Trigger Property="TabStripPlacement" Value="Left">
-                            <Setter TargetName="PART_ColorZone" Property="DockPanel.Dock" Value="Left"/>
-                            <Setter TargetName="HeaderPanel" Property="Rows" Value="0"/>
-                            <Setter TargetName="HeaderPanel" Property="Columns" Value="1"/>
+                            <Setter TargetName="PART_HeaderCard" Property="DockPanel.Dock" Value="Left" />
+                            <Setter TargetName="HeaderPanel" Property="Rows" Value="0" />
+                            <Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Right" />
+                            <Setter TargetName="HeaderPanel" Property="Columns" Value="1" />
                         </Trigger>
                         <Trigger Property="TabStripPlacement" Value="Right">
-                            <Setter TargetName="PART_ColorZone" Property="DockPanel.Dock" Value="Right"/>
-                            <Setter TargetName="HeaderPanel" Property="Rows" Value="0"/>
-                            <Setter TargetName="HeaderPanel" Property="Columns" Value="1"/>
+                            <Setter TargetName="PART_HeaderCard" Property="DockPanel.Dock" Value="Right" />
+                            <Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Left" />
+                            <Setter TargetName="HeaderPanel" Property="Rows" Value="0" />
+                            <Setter TargetName="HeaderPanel" Property="Columns" Value="1" />
                         </Trigger>
-
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type TabItem}" x:Key="MaterialDesignTabItem">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-        <Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>
-        <Setter Property="Padding" Value="16 12 16 12"/>
-        <Setter Property="Height" Value="72" />
+    <Style
+        x:Key="MaterialDesignTabControl"
+        BasedOn="{StaticResource MaterialDesignTabControlBase}"
+        TargetType="{x:Type TabControl}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="wpf:ColorZoneAssist.Background" Value="Transparent" />
+
+        <Style.Triggers>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="Standard">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource MaterialDesignBody}" />
+            </Trigger>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="PrimaryMid">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
+            </Trigger>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="PrimaryLight">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource PrimaryHueLightBrush}" />
+            </Trigger>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="PrimaryDark">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource PrimaryHueDarkBrush}" />
+            </Trigger>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="SecondaryLight">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource SecondaryHueLightBrush}" />
+            </Trigger>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="SecondaryMid">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource SecondaryHueMidBrush}" />
+            </Trigger>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="SecondaryDark">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource SecondaryHueDarkBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style
+        x:Key="MaterialDesignFilledTabControl"
+        BasedOn="{StaticResource MaterialDesignTabControlBase}"
+        TargetType="{x:Type TabControl}">
+
+        <Style.Triggers>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="Standard">
+                <Setter Property="wpf:ColorZoneAssist.Background" Value="{DynamicResource MaterialDesignBody}" />
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource MaterialDesignBody}" />
+            </Trigger>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="PrimaryMid">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource PrimaryHueMidForegroundBrush}" />
+                <Setter Property="wpf:ColorZoneAssist.Background" Value="{DynamicResource PrimaryHueMidBrush}" />
+            </Trigger>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="PrimaryLight">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource PrimaryHueLightForegroundBrush}" />
+                <Setter Property="wpf:ColorZoneAssist.Background" Value="{DynamicResource PrimaryHueLightBrush}" />
+            </Trigger>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="PrimaryDark">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}" />
+                <Setter Property="wpf:ColorZoneAssist.Background" Value="{DynamicResource PrimaryHueDarkBrush}" />
+            </Trigger>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="SecondaryLight">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource SecondaryHueLightForegroundBrush}" />
+                <Setter Property="wpf:ColorZoneAssist.Background" Value="{DynamicResource SecondaryHueLightBrush}" />
+            </Trigger>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="SecondaryMid">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
+                <Setter Property="wpf:ColorZoneAssist.Background" Value="{DynamicResource SecondaryHueMidBrush}" />
+            </Trigger>
+            <Trigger Property="wpf:ColorZoneAssist.Mode" Value="SecondaryDark">
+                <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{DynamicResource SecondaryHueDarkForegroundBrush}" />
+                <Setter Property="wpf:ColorZoneAssist.Background" Value="{DynamicResource SecondaryHueDarkBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MaterialDesignTabItem" TargetType="{x:Type TabItem}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
+
+        <!--  Foreground is for the content, not the header  -->
+        <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
+
+        <Setter Property="Padding" Value="16,12" />
+        <Setter Property="Height" Value="48" />
+        <Setter Property="MinWidth" Value="90" />
+        <Setter Property="MaxWidth" Value="360" />
         <Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource MaterialDesignFlatButtonRipple}" />
+        <Setter Property="wpf:ColorZoneAssist.Mode" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(wpf:ColorZoneAssist.Mode)}" />
+        <Setter Property="wpf:ColorZoneAssist.Background" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(wpf:ColorZoneAssist.Background)}" />
+        <Setter Property="wpf:ColorZoneAssist.Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(wpf:ColorZoneAssist.Foreground)}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
-                    <Grid x:Name="Root" >
+                    <Grid x:Name="Root">
+                        <!--  This is the Header label ColorZone.  -->
+                        <wpf:ColorZone
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Background="{TemplateBinding wpf:ColorZoneAssist.Background}"
+                            Focusable="False"
+                            Foreground="{TemplateBinding wpf:ColorZoneAssist.Foreground}"
+                            Mode="{TemplateBinding wpf:ColorZoneAssist.Mode}">
+                            <wpf:Ripple
+                                x:Name="contentPresenter"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Content="{TemplateBinding Header}"
+                                ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                Focusable="False"
+                                Opacity=".82"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                TextBlock.FontSize="14"
+                                TextBlock.FontWeight="Medium"
+                                TextOptions.TextFormattingMode="Ideal"
+                                TextOptions.TextRenderingMode="Auto"
+                                Typography.Capitals="{TemplateBinding Typography.Capitals}" />
+                        </wpf:ColorZone>
+                        <Border
+                            x:Name="SelectionHighlightBorder"
+                            BorderBrush="{TemplateBinding wpf:ColorZoneAssist.Foreground}"
+                            BorderThickness="0,0,0,2"
+                            RenderTransformOrigin="0.5,0.5"
+                            Visibility="Hidden">
+                            <Border.RenderTransform>
+                                <ScaleTransform x:Name="ScaleTransform" ScaleX="0" ScaleY="1" />
+                            </Border.RenderTransform>
+                            <Rectangle
+                                x:Name="PART_BackgroundSelection"
+                                Fill="{TemplateBinding Background}"
+                                Opacity="0.12" />
+                        </Border>
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="SelectionStates">
                                 <VisualState x:Name="Selected">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="ScaleTransform" From="0" To="1" Duration="0:0:0.3">
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ScaleTransform"
+                                            Storyboard.TargetProperty="ScaleX"
+                                            From="0"
+                                            To="1"
+                                            Duration="0:0:0.3">
                                             <DoubleAnimation.EasingFunction>
                                                 <SineEase EasingMode="EaseOut" />
                                             </DoubleAnimation.EasingFunction>
                                         </DoubleAnimation>
-                                        <DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_BackgroundSelection" To="0.12" BeginTime="0:0:0.3" Duration="0" />
+                                        <DoubleAnimation
+                                            BeginTime="0:0:0.3"
+                                            Storyboard.TargetName="PART_BackgroundSelection"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0.12"
+                                            Duration="0" />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Unselected">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="ScaleTransform" To="0" Duration="0" />
-                                        <DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_BackgroundSelection" To="0" Duration="0" />
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ScaleTransform"
+                                            Storyboard.TargetProperty="ScaleX"
+                                            To="0"
+                                            Duration="0" />
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="PART_BackgroundSelection"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0"
+                                            Duration="0" />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-
-
-                        <wpf:ColorZone Grid.RowSpan="2" x:Name="tabitemcz"
-                                       HorizontalAlignment="Stretch"
-                                       VerticalAlignment="Stretch"
-                                       Focusable="False"
-                                       Mode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Mode)}" 
-                                       Background="{x:Null}"
-                                       wpf:ColorZoneAssist.Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Background)}"
-                                       wpf:ColorZoneAssist.Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Foreground)}">
-                            <wpf:Ripple Focusable="False"
-                                        Typography.Capitals="AllSmallCaps"
-                                        Content="{TemplateBinding Header}" 
-                                        ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                        ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                        HorizontalContentAlignment="Center"
-                                        VerticalContentAlignment="Center"
-                                        RecognizesAccessKey="True"
-                                        x:Name="contentPresenter"
-                                        Opacity=".82"
-                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                                        Padding="{TemplateBinding Padding}"
-                                        TextBlock.FontWeight="Medium"
-                                        TextBlock.FontSize="15"
-                                        TextOptions.TextFormattingMode="Ideal" 
-                                        TextOptions.TextRenderingMode="Auto">
-                            </wpf:Ripple>
-                        </wpf:ColorZone>
-                        <Border x:Name="SelectionHighlightBorder" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="0,0,0,2"
-                                Visibility="Hidden" RenderTransformOrigin="0.5,0.5">
-                            <Border.RenderTransform>
-                                <ScaleTransform x:Name="ScaleTransform" ScaleX="0" ScaleY="1" />
-                            </Border.RenderTransform>
-                            <Rectangle x:Name="PART_BackgroundSelection" Fill="{TemplateBinding Background}" Opacity="0.12"/>
-                        </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" Value="0.38"/>
+                            <Setter Property="Opacity" Value="0.38" />
                         </Trigger>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="contentPresenter" Property="Opacity" Value="1"/>
+                            <Setter TargetName="contentPresenter" Property="Opacity" Value="1" />
                             <Setter TargetName="SelectionHighlightBorder" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <DataTrigger Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom">
@@ -175,79 +290,61 @@
                         <DataTrigger Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right">
                             <Setter TargetName="SelectionHighlightBorder" Property="BorderThickness" Value="2,0,0,0" />
                         </DataTrigger>
-                        <Trigger Property="wpf:ColorZoneAssist.Mode" Value="PrimaryLight">
-                            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueLightForegroundBrush}" />
-                            <Setter Property="Background" Value="{DynamicResource PrimaryHueLightForegroundBrush}" />
-                        </Trigger>
-                        <Trigger Property="wpf:ColorZoneAssist.Mode" Value="PrimaryMid">
-                            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidForegroundBrush}" />
-                            <Setter Property="Background" Value="{DynamicResource PrimaryHueMidForegroundBrush}" />
-                        </Trigger>
-                        <Trigger Property="wpf:ColorZoneAssist.Mode" Value="PrimaryDark">
-                            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueDarkForegroundBrush}" />
-                            <Setter Property="Background" Value="{DynamicResource PrimaryHueDarkForegroundBrush}" />
-                        </Trigger>
-                        <Trigger Property="wpf:ColorZoneAssist.Mode" Value="SecondaryMid">
-                            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
-                            <Setter Property="Background" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
-                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type TabItem}" x:Key="MaterialDesignTabItemCompact" BasedOn="{StaticResource MaterialDesignTabItem}">
-        <Setter Property="Height" Value="48" />
-    </Style>-->
-
-    <!--NAVIGATION RAIL-->
+    <!--  NAVIGATION RAIL  -->
 
-    <Style TargetType="{x:Type TabItem}" x:Key="MaterialDesignNavigationRailTabItem">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}"/>
-        <Setter Property="Padding" Value="0"/>
+    <Style x:Key="MaterialDesignNavigationRailTabItem" TargetType="{x:Type TabItem}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
+        <Setter Property="Padding" Value="0" />
         <Setter Property="Height" Value="72" />
         <Setter Property="Width" Value="72" />
         <Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource MaterialDesignFlatButtonRipple}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
-                    <Grid x:Name="Root"
-                          Cursor="Hand">
-                        <Grid >
-                            <Border Background="{TemplateBinding Background}"
-                                       x:Name="MouseOverBorder"
-                                       Visibility="Hidden"
-                                       Opacity=".08"
-                                       CornerRadius="{Binding Path=(wpf:NavigationRailAssist.SelectionCornerRadius), RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}"/>
-                            <wpf:ColorZone x:Name="colorZone"
-                                           HorizontalAlignment="Stretch"
-                                           VerticalAlignment="Stretch"
-                                           Cursor="Hand"
-                                           Focusable="False"
-                                           Mode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Mode)}" 
-                                           Background="{x:Null}"
-                                           wpf:ColorZoneAssist.Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Background)}"
-                                           wpf:ColorZoneAssist.Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Foreground)}">
-                                <wpf:Ripple Focusable="False"
-                                            ClipToBounds="True"
-                                            Content="{TemplateBinding Header}"
-                                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                            ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                            HorizontalContentAlignment="Center"
-                                            VerticalContentAlignment="Center"
-                                            RecognizesAccessKey="True"
-                                            x:Name="contentPresenter"
-                                            Opacity=".52"
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                                            Padding="{TemplateBinding Padding}"
-                                            TextBlock.FontWeight="Medium"
-                                            TextBlock.FontSize="15"
-                                            TextOptions.TextFormattingMode="Ideal" 
-                                            TextOptions.TextRenderingMode="Auto">
+                    <Grid x:Name="Root" Cursor="Hand">
+                        <Grid>
+                            <Border
+                                x:Name="MouseOverBorder"
+                                Background="{TemplateBinding Background}"
+                                CornerRadius="{Binding Path=(wpf:NavigationRailAssist.SelectionCornerRadius), RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}"
+                                Opacity=".08"
+                                Visibility="Hidden" />
+                            <wpf:ColorZone
+                                x:Name="colorZone"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                wpf:ColorZoneAssist.Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Background)}"
+                                wpf:ColorZoneAssist.Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Foreground)}"
+                                Background="{x:Null}"
+                                Cursor="Hand"
+                                Focusable="False"
+                                Mode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Mode)}">
+                                <wpf:Ripple
+                                    x:Name="contentPresenter"
+                                    Padding="{TemplateBinding Padding}"
+                                    HorizontalContentAlignment="Center"
+                                    VerticalContentAlignment="Center"
+                                    ClipToBounds="True"
+                                    Content="{TemplateBinding Header}"
+                                    ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                    ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                    Focusable="False"
+                                    Opacity=".52"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                    TextBlock.FontSize="15"
+                                    TextBlock.FontWeight="Medium"
+                                    TextOptions.TextFormattingMode="Ideal"
+                                    TextOptions.TextRenderingMode="Auto">
                                     <wpf:Ripple.Clip>
                                         <MultiBinding Converter="{StaticResource BorderClipConverter}">
                                             <Binding ElementName="MouseOverBorder" Path="ActualWidth" />
@@ -259,37 +356,37 @@
                                 </wpf:Ripple>
                             </wpf:ColorZone>
                         </Grid>
-                        <Border x:Name="SelectionHighlightBorder" 
-                                Visibility="Hidden" >
-                            <Border x:Name="PART_BackgroundSelection"
-                                       Background="{TemplateBinding Background}"
-                                       Opacity="0.12"
-                                       CornerRadius="{Binding Path=(wpf:NavigationRailAssist.SelectionCornerRadius), RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}"/>
+                        <Border x:Name="SelectionHighlightBorder" Visibility="Hidden">
+                            <Border
+                                x:Name="PART_BackgroundSelection"
+                                Background="{TemplateBinding Background}"
+                                CornerRadius="{Binding Path=(wpf:NavigationRailAssist.SelectionCornerRadius), RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}"
+                                Opacity="0.12" />
                         </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" Value="0.38"/>
+                            <Setter Property="Opacity" Value="0.38" />
                         </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="Root">
-                            <Setter TargetName="MouseOverBorder" Property="Visibility" Value="Visible"/>
+                        <Trigger SourceName="Root" Property="IsMouseOver" Value="True">
+                            <Setter TargetName="MouseOverBorder" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="contentPresenter" Property="Opacity" Value="1"/>
+                            <Setter TargetName="contentPresenter" Property="Opacity" Value="1" />
                         </Trigger>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsSelected" Value="True"/>
-                                <Condition Property="wpf:ColorZoneAssist.Mode" Value="Standard"/>
+                                <Condition Property="IsSelected" Value="True" />
+                                <Condition Property="wpf:ColorZoneAssist.Mode" Value="Standard" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="contentPresenter" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}"/>
+                            <Setter TargetName="contentPresenter" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
                         </MultiTrigger>
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(wpf:NavigationRailAssist.ShowSelectionBackground), RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="True"/>
+                                <Condition Binding="{Binding Path=(wpf:NavigationRailAssist.ShowSelectionBackground), RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="SelectionHighlightBorder" Property="Visibility" Value="Visible" />
                         </MultiDataTrigger>
@@ -326,100 +423,110 @@
                             <Setter Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Foreground)}" />
                             <Setter Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Foreground)}" />
                         </Trigger>
-                        
+
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style  TargetType="{x:Type TabControl}" x:Key="MaterialDesignNavigatilRailTabControl">
+    <Style x:Key="MaterialDesignNavigatilRailTabControl" TargetType="{x:Type TabControl}">
         <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
         <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
-        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="VerticalContentAlignment" Value="Top" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource MaterialDesignFlatButtonRipple}" />
         <Setter Property="TabStripPlacement" Value="Left" />
-        <Setter Property="BorderThickness" Value="0,0,1,0"/>
-        <Setter Property="wpf:ShadowAssist.ShadowDepth" Value="Depth0"/>
-        <Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Right"/>
-        <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignNavigationRailTabItem}"/>
+        <Setter Property="BorderThickness" Value="0,0,1,0" />
+        <Setter Property="wpf:ShadowAssist.ShadowDepth" Value="Depth0" />
+        <Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Right" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignNavigationRailTabItem}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
-                    <DockPanel Background="{TemplateBinding Background}" 
-                               KeyboardNavigation.TabNavigation="Local">
-                        <!--tabs-->
-                        <Grid x:Name="TabGrid" DockPanel.Dock="Left" SnapsToDevicePixels="True">
-                            <wpf:Card wpf:ShadowAssist.ShadowDepth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowDepth)}"
-                                      wpf:ShadowAssist.ShadowEdges="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowEdges)}"
-                                      BorderBrush="{DynamicResource MaterialDesignDivider}"
-                                      BorderThickness="{TemplateBinding BorderThickness}"
-                                      UniformCornerRadius="0" x:Name="shadowCard"
-                                      Background="{TemplateBinding Background}" 
-                                      Visibility="Visible"/>
+                    <DockPanel Background="{TemplateBinding Background}" KeyboardNavigation.TabNavigation="Local">
+                        <!--  tabs  -->
+                        <Grid
+                            x:Name="TabGrid"
+                            DockPanel.Dock="Left"
+                            SnapsToDevicePixels="True">
+                            <wpf:Card
+                                x:Name="shadowCard"
+                                wpf:ShadowAssist.ShadowDepth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowDepth)}"
+                                wpf:ShadowAssist.ShadowEdges="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowEdges)}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{DynamicResource MaterialDesignDivider}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                UniformCornerRadius="0"
+                                Visibility="Visible" />
 
-                            <wpf:ColorZone x:Name="PART_ColorZone" 
-                                           VerticalAlignment="Stretch"
-                                           Focusable="False"
-                                           Mode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Mode)}" 
-                                           wpf:ColorZoneAssist.Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Background)}"
-                                           wpf:ColorZoneAssist.Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Foreground)}">
-                                <Grid Background="{Binding ElementName=PART_ColorZone, Path=Background}">
+                            <wpf:ColorZone
+                                x:Name="PART_HeaderCard"
+                                VerticalAlignment="Stretch"
+                                wpf:ColorZoneAssist.Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Background)}"
+                                wpf:ColorZoneAssist.Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Foreground)}"
+                                Focusable="False"
+                                Mode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Mode)}">
+                                <Grid Background="{Binding ElementName=PART_HeaderCard, Path=Background}">
                                     <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="1*"/>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="1*" />
                                     </Grid.RowDefinitions>
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="1*"/>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="1*" />
                                     </Grid.ColumnDefinitions>
-                                    <ContentPresenter Focusable="False"
-                                                      x:Name="FloatingContentPanel"
-                                                      Grid.Row="0"
-                                                      Grid.Column="0"
-                                                      HorizontalAlignment="Center"
-                                                      VerticalAlignment="Center"
-                                                      Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:NavigationRailAssist.FloatingContent)}" />
-                                    <UniformGrid x:Name="HeaderPanel"
-                                                 Grid.Row="1"
-                                                 Grid.Column="0"
-                                                 Columns="1"
-                                                 Rows="0" 
-                                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                 IsItemsHost="True"
-                                                 Focusable="False"
-                                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+                                    <ContentPresenter
+                                        x:Name="FloatingContentPanel"
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:NavigationRailAssist.FloatingContent)}"
+                                        Focusable="False" />
+                                    <UniformGrid
+                                        x:Name="HeaderPanel"
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        Columns="1"
+                                        Focusable="False"
+                                        IsItemsHost="True"
+                                        Rows="0" />
 
-                                    <Rectangle x:Name="DividerRect" Fill="{DynamicResource MaterialDesignDivider}"
-                                               Width="1"
-                                               Height="Auto"
-                                               Grid.RowSpan="2"
-                                               HorizontalAlignment="Right"
-                                               Visibility="Collapsed"/>
+                                    <Rectangle
+                                        x:Name="DividerRect"
+                                        Grid.RowSpan="2"
+                                        Width="1"
+                                        Height="Auto"
+                                        HorizontalAlignment="Right"
+                                        Fill="{DynamicResource MaterialDesignDivider}"
+                                        Visibility="Collapsed" />
                                 </Grid>
                             </wpf:ColorZone>
 
                         </Grid>
-                        <!--selected content-->
-                        <wpf:ColorZone x:Name="PART_ColorZoneSelectedContent" 
-                                       Padding="{TemplateBinding Padding}" 
-                                       VerticalAlignment="Stretch"
-                                       HorizontalAlignment="Stretch"
-                                       Mode="Standard" 
-                                       Foreground="{DynamicResource MaterialDesignBody}"
-                                       Background="{x:Null}">
+                        <!--  selected content  -->
+                        <wpf:ColorZone
+                            x:Name="PART_HeaderCardSelectedContent"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Background="{x:Null}"
+                            Foreground="{DynamicResource MaterialDesignBody}"
+                            Mode="Standard">
 
-                            <ContentPresenter x:Name="PART_SelectedContentHost"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                                              Focusable="False"
-                                              Margin="{TemplateBinding Padding}"
-                                              ContentSource="SelectedContent"
-                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}">
-                            </ContentPresenter>
+                            <ContentPresenter
+                                x:Name="PART_SelectedContentHost"
+                                Margin="{TemplateBinding Padding}"
+                                ContentSource="SelectedContent"
+                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                Focusable="False"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </wpf:ColorZone>
                     </DockPanel>
                     <ControlTemplate.Triggers>
@@ -428,42 +535,42 @@
                             <Setter TargetName="DividerRect" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <Trigger Property="wpf:ColorZoneAssist.Mode" Value="Standard">
-                            <Setter TargetName="PART_ColorZone" Property="Background" Value="Transparent"/>
+                            <Setter TargetName="PART_HeaderCard" Property="Background" Value="Transparent" />
                         </Trigger>
                         <Trigger Property="TabStripPlacement" Value="Top">
-                            <Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Bottom"/>
+                            <Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Bottom" />
                             <Setter Property="BorderThickness" Value="0,0,0,1" />
-                            <Setter TargetName="TabGrid" Property="DockPanel.Dock" Value="Top"/>
+                            <Setter TargetName="TabGrid" Property="DockPanel.Dock" Value="Top" />
                             <Setter TargetName="DividerRect" Property="Width" Value="Auto" />
                             <Setter TargetName="DividerRect" Property="Height" Value="1" />
                             <Setter TargetName="DividerRect" Property="VerticalAlignment" Value="Bottom" />
                             <Setter TargetName="DividerRect" Property="HorizontalAlignment" Value="Stretch" />
                             <Setter TargetName="DividerRect" Property="Grid.ColumnSpan" Value="2" />
                             <Setter TargetName="DividerRect" Property="Grid.RowSpan" Value="1" />
-                            <Setter TargetName="HeaderPanel" Property="Rows" Value="1"/>
-                            <Setter TargetName="HeaderPanel" Property="Columns" Value="0"/>
-                            <Setter TargetName="HeaderPanel" Property="Grid.Column" Value="1"/>
-                            <Setter TargetName="HeaderPanel" Property="Grid.Row" Value="0"/>
+                            <Setter TargetName="HeaderPanel" Property="Rows" Value="1" />
+                            <Setter TargetName="HeaderPanel" Property="Columns" Value="0" />
+                            <Setter TargetName="HeaderPanel" Property="Grid.Column" Value="1" />
+                            <Setter TargetName="HeaderPanel" Property="Grid.Row" Value="0" />
                         </Trigger>
                         <Trigger Property="TabStripPlacement" Value="Bottom">
-                            <Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Top"/>
+                            <Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Top" />
                             <Setter Property="BorderThickness" Value="0,1,0,0" />
-                            <Setter TargetName="TabGrid" Property="DockPanel.Dock" Value="Bottom"/>
+                            <Setter TargetName="TabGrid" Property="DockPanel.Dock" Value="Bottom" />
                             <Setter TargetName="DividerRect" Property="Width" Value="Auto" />
                             <Setter TargetName="DividerRect" Property="Height" Value="1" />
                             <Setter TargetName="DividerRect" Property="VerticalAlignment" Value="Top" />
                             <Setter TargetName="DividerRect" Property="HorizontalAlignment" Value="Stretch" />
                             <Setter TargetName="DividerRect" Property="Grid.ColumnSpan" Value="2" />
                             <Setter TargetName="DividerRect" Property="Grid.RowSpan" Value="1" />
-                            <Setter TargetName="HeaderPanel" Property="Rows" Value="1"/>
-                            <Setter TargetName="HeaderPanel" Property="Columns" Value="0"/>
-                            <Setter TargetName="HeaderPanel" Property="Grid.Column" Value="1"/>
-                            <Setter TargetName="HeaderPanel" Property="Grid.Row" Value="0"/>
+                            <Setter TargetName="HeaderPanel" Property="Rows" Value="1" />
+                            <Setter TargetName="HeaderPanel" Property="Columns" Value="0" />
+                            <Setter TargetName="HeaderPanel" Property="Grid.Column" Value="1" />
+                            <Setter TargetName="HeaderPanel" Property="Grid.Row" Value="0" />
                         </Trigger>
                         <Trigger Property="TabStripPlacement" Value="Right">
-                            <Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Left"/>
-                            <Setter Property="BorderThickness" Value="1,0,0,0"/>
-                            <Setter TargetName="TabGrid" Property="DockPanel.Dock" Value="Right"/>
+                            <Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Left" />
+                            <Setter Property="BorderThickness" Value="1,0,0,0" />
+                            <Setter TargetName="TabGrid" Property="DockPanel.Dock" Value="Right" />
                             <Setter TargetName="DividerRect" Property="HorizontalAlignment" Value="Left" />
                         </Trigger>
                     </ControlTemplate.Triggers>