diff --git a/MainDemo.Wpf/MenusAndToolBars.xaml b/MainDemo.Wpf/MenusAndToolBars.xaml
index 1ed1f3b6de..2dea7eeb66 100644
--- a/MainDemo.Wpf/MenusAndToolBars.xaml
+++ b/MainDemo.Wpf/MenusAndToolBars.xaml
@@ -218,6 +218,26 @@
 
         <smtx:XamlDisplay
             UniqueKey="menus_3"
+            DockPanel.Dock="Top"
+            Margin="5 16 0 0">
+            <ToolBarTray>
+                <ToolBar
+                    Style="{StaticResource MaterialDesignToolBar}"
+                    ClipToBounds="False">
+                    <Menu>
+                        <MenuItem
+                            Header="Nested">
+                            <MenuItem
+                                Header="Item 1" />
+                            <MenuItem
+                                Header="Item 2" />
+                        </MenuItem>
+                    </Menu>              
+                </ToolBar>
+            </ToolBarTray>
+        </smtx:XamlDisplay>
+        <smtx:XamlDisplay
+            UniqueKey="menus_4"
             Margin="16"
             VerticalAlignment="Top"
             HorizontalAlignment="Left">
@@ -225,7 +245,7 @@
         </smtx:XamlDisplay>
 
         <smtx:XamlDisplay
-            UniqueKey="menus_4"
+            UniqueKey="menus_5"
             Margin="16"
             VerticalAlignment="Top"
             HorizontalAlignment="Left">
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
index f2ce61e5dd..5826958ed0 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
@@ -1,233 +1,282 @@
-<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:wpf="clr-namespace:MaterialDesignThemes.Wpf"
+    xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Font.xaml"/>
+        <ResourceDictionary
+            Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Font.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <converters:TextFieldHintVisibilityConverter x:Key="StringIsEmptyVisibilityConverter" IsEmptyValue="Collapsed" IsNotEmptyValue="Visible"/>
-    <converters:BrushRoundConverter x:Key="BrushRoundConverter"/>
-    
-    <ContextMenu x:Key="MaterialDesignDefaultContextMenu"
-                 FontFamily="{Binding PlacementTarget.FontFamily, RelativeSource={RelativeSource Self}}">
-        <MenuItem Command="Cut">
+    <converters:TextFieldHintVisibilityConverter
+        x:Key="StringIsEmptyVisibilityConverter"
+        IsEmptyValue="Collapsed"
+        IsNotEmptyValue="Visible" />
+    <converters:BrushRoundConverter
+        x:Key="BrushRoundConverter" />
+
+    <ContextMenu
+        x:Key="MaterialDesignDefaultContextMenu"
+        FontFamily="{Binding PlacementTarget.FontFamily, RelativeSource={RelativeSource Self}}">
+        <MenuItem
+            Command="Cut">
             <MenuItem.Icon>
-                <wpf:PackIcon Kind="ContentCut" />
+                <wpf:PackIcon
+                    Kind="ContentCut" />
             </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Command="Copy">
+        <MenuItem
+            Command="Copy">
             <MenuItem.Icon>
-                <wpf:PackIcon Kind="ContentCopy" />
+                <wpf:PackIcon
+                    Kind="ContentCopy" />
             </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Command="Paste">
+        <MenuItem
+            Command="Paste">
             <MenuItem.Icon>
-                <wpf:PackIcon Kind="ContentPaste" />
+                <wpf:PackIcon
+                    Kind="ContentPaste" />
             </MenuItem.Icon>
         </MenuItem>
         <Separator />
-        <MenuItem Command="SelectAll">
+        <MenuItem
+            Command="SelectAll">
             <MenuItem.Icon>
-                <wpf:PackIcon Kind="SelectAll" />
+                <wpf:PackIcon
+                    Kind="SelectAll" />
             </MenuItem.Icon>
         </MenuItem>
     </ContextMenu>
 
-    <Style x:Key="MaterialDesignSeparator" TargetType="{x:Type Separator}">
-        <Setter Property="Background" Value="{DynamicResource MaterialDesignSelection}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignSelection}"/>
-        <Setter Property="MinHeight" Value="1"/>
-        <Setter Property="SnapsToDevicePixels" Value="true"/>
-        <Setter Property="Height" Value="16"/>
-        <Setter Property="Template">
+    <Style
+        x:Key="MaterialDesignSeparator"
+        TargetType="{x:Type Separator}">
+        <Setter
+            Property="Background"
+            Value="{DynamicResource MaterialDesignSelection}" />
+        <Setter
+            Property="BorderBrush"
+            Value="{DynamicResource MaterialDesignSelection}" />
+        <Setter
+            Property="MinHeight"
+            Value="1" />
+        <Setter
+            Property="SnapsToDevicePixels"
+            Value="true" />
+        <Setter
+            Property="Height"
+            Value="16" />
+        <Setter
+            Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Separator}">
-                    <Rectangle Height="1" Fill="{TemplateBinding Background}"
-                               HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <ControlTemplate
+                    TargetType="{x:Type Separator}">
+                    <Rectangle
+                        Height="1"
+                        Fill="{TemplateBinding Background}"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Center" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="MaterialDesignMenu" TargetType="{x:Type MenuBase}">
-        <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}"/>
-        <Setter Property="FontFamily" Value="{StaticResource MaterialDesignFont}"/>
-        <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}"/>
-        <Setter Property="TextBlock.FontSize" Value="15"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="Template">
+    <Style
+        TargetType="{x:Type MenuItem}"
+        x:Key="MaterialDesignMenuItem"
+        BasedOn="{x:Null}">
+        <Setter
+            Property="Padding"
+            Value="24 0 24 0"></Setter>
+        <Setter
+            Property="OverridesDefaultStyle"
+            Value="True" />
+        <Setter
+            Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type MenuBase}">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Background="{TemplateBinding Background}"
-                            Padding="{TemplateBinding Padding}"
-                            SnapsToDevicePixels="true">
-                        <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MaterialDesignContextMenu" TargetType="{x:Type ContextMenu}" BasedOn="{StaticResource MaterialDesignMenu}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type MenuBase}">
-                    <AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
-                        <Grid>
-                            <Border Background="{TemplateBinding Background}" Margin="3"
-                                    CornerRadius="2" Effect="{DynamicResource MaterialDesignShadowDepth1}"></Border>
-                        
-                            <Border Margin="3" Background="Transparent">
-                                <ScrollViewer x:Name="SubMenuScrollViewer" Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">
-                                    <Grid RenderOptions.ClearTypeHint="Enabled" Margin="0 16">
-                                        <ItemsPresenter x:Name="ItemsPresenter"
-                                                        KeyboardNavigation.DirectionalNavigation="Cycle"
-                                                        Grid.IsSharedSizeScope="True"
-                                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                        KeyboardNavigation.TabNavigation="Cycle"/>
-                                    </Grid>
-                                </ScrollViewer>
-                            </Border>
-                        </Grid>
-                    </AdornerDecorator>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type MenuItem}" x:Key="MaterialDesignMenuItem" BasedOn="{x:Null}">
-        <Setter Property="Padding" Value="24 0 24 0"></Setter>
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type MenuItem}">
+                <ControlTemplate
+                    TargetType="{x:Type MenuItem}">
                     <ControlTemplate.Resources>
-                        <Style TargetType="wpf:PackIcon">
-                            <Setter Property="FrameworkElement.Width" Value="16" />
-                            <Setter Property="FrameworkElement.Height" Value="16" />
+                        <Style
+                            TargetType="wpf:PackIcon">
+                            <Setter
+                                Property="FrameworkElement.Width"
+                                Value="16" />
+                            <Setter
+                                Property="FrameworkElement.Height"
+                                Value="16" />
                         </Style>
                     </ControlTemplate.Resources>
-                    <Grid ClipToBounds="True">
-                        <Border x:Name="templateRoot"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}"
-                                SnapsToDevicePixels="True"/>
-                        <Border x:Name="BackgroundRoot"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Foreground, Converter={StaticResource BrushRoundConverter}}"
-                                SnapsToDevicePixels="True"
-                                Opacity="0"/>
-                        <wpf:Ripple Background="Transparent"
-                                    HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
-                                    Focusable="False"
-                                    Feedback="{TemplateBinding Foreground, Converter={StaticResource BrushRoundConverter}}">
-                            <Grid Height="{TemplateBinding Height}" Background="Transparent">
-                                <Grid VerticalAlignment="Center"
-                                      Background="Transparent"
-                                      Margin="{TemplateBinding Padding}">
+                    <Grid
+                        ClipToBounds="True">
+                        <Border
+                            x:Name="templateRoot"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Background="{TemplateBinding Background}"
+                            SnapsToDevicePixels="True" />
+                        <Border
+                            x:Name="BackgroundRoot"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Background="{TemplateBinding Foreground, Converter={StaticResource BrushRoundConverter}}"
+                            SnapsToDevicePixels="True"
+                            Opacity="0" />
+                        <wpf:Ripple
+                            Background="Transparent"
+                            HorizontalContentAlignment="Stretch"
+                            VerticalContentAlignment="Stretch"
+                            Focusable="False"
+                            Feedback="{TemplateBinding Foreground, Converter={StaticResource BrushRoundConverter}}">
+                            <Grid
+                                Height="{TemplateBinding Height}"
+                                Background="Transparent">
+                                <Grid
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    Margin="{TemplateBinding Padding}">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" SharedSizeGroup="IconGroup"/>
-                                        <ColumnDefinition Width="*" SharedSizeGroup="HeaderGroup"/>
-                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition
+                                            Width="Auto"
+                                            SharedSizeGroup="IconGroup" />
+                                        <ColumnDefinition
+                                            Width="*"
+                                            SharedSizeGroup="HeaderGroup" />
+                                        <ColumnDefinition
+                                            Width="*" />
                                     </Grid.ColumnDefinitions>
-                                    <Grid x:Name="IconWrapper" Visibility="Visible" Width="40">
-                                        <ContentPresenter x:Name="Icon"
-                                                          Content="{TemplateBinding Icon}"
-                                                          ContentSource="Icon"
-                                                          HorizontalAlignment="Left" VerticalAlignment="Center"
-                                                          Height="16" Width="16"
-                                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                    <Grid
+                                        x:Name="IconWrapper"
+                                        Visibility="Visible"
+                                        Width="40">
+                                        <ContentPresenter
+                                            x:Name="Icon"
+                                            Content="{TemplateBinding Icon}"
+                                            ContentSource="Icon"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            Height="16"
+                                            Width="16"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                     </Grid>
-                                    <Grid x:Name="GlyphWrapper" Visibility="Collapsed" Width="40">
-                                        <Viewbox x:Name="GlyphPanel"
-                                                 Width="16" Height="16"
-                                                 HorizontalAlignment="Left"
-                                                 Margin="0" Visibility="Collapsed" VerticalAlignment="Center"
-                                                 FlowDirection="LeftToRight">
-                                            <Canvas Width="24" Height="24">
-                                                <Path Data="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" 
-					    		        			  x:Name="Glyph"
-					    		        			  Fill="{TemplateBinding Foreground}" FlowDirection="LeftToRight" />
+                                    <Grid
+                                        x:Name="GlyphWrapper"
+                                        Visibility="Collapsed"
+                                        Width="40">
+                                        <Viewbox
+                                            x:Name="GlyphPanel"
+                                            Width="16"
+                                            Height="16"
+                                            HorizontalAlignment="Left"
+                                            Margin="0"
+                                            Visibility="Collapsed"
+                                            VerticalAlignment="Center"
+                                            FlowDirection="LeftToRight">
+                                            <Canvas
+                                                Width="24"
+                                                Height="24">
+                                                <Path
+                                                    Data="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z"
+                                                    x:Name="Glyph"
+                                                    Fill="{TemplateBinding Foreground}"
+                                                    FlowDirection="LeftToRight" />
                                             </Canvas>
                                         </Viewbox>
                                     </Grid>
-                                    <Grid Grid.Column="1">
-                                        <ContentPresenter x:Name="BoldHeaderPresenter"
-                                                          Visibility="Hidden"
-                                                          TextBlock.FontWeight="Bold"
-                                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                          Content="{TemplateBinding Header}"
-                                                          ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                                          ContentSource="Header"
-                                                          RecognizesAccessKey="True"
-                                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                          VerticalAlignment="Center"/>
-                                        <ContentPresenter x:Name="HeaderPresenter"
-                                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                          Content="{TemplateBinding Header}"
-                                                          ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                                          ContentSource="Header"
-                                                          RecognizesAccessKey="True"
-                                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                          VerticalAlignment="Center"/>
+                                    <Grid
+                                        Grid.Column="1">
+                                        <ContentPresenter
+                                            x:Name="BoldHeaderPresenter"
+                                            Visibility="Hidden"
+                                            TextBlock.FontWeight="Bold"
+                                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                            Content="{TemplateBinding Header}"
+                                            ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                            ContentSource="Header"
+                                            RecognizesAccessKey="True"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                            VerticalAlignment="Center" />
+                                        <ContentPresenter
+                                            x:Name="HeaderPresenter"
+                                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                            Content="{TemplateBinding Header}"
+                                            ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                            ContentSource="Header"
+                                            RecognizesAccessKey="True"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                            VerticalAlignment="Center" />
                                     </Grid>
-                                    <Grid x:Name="InputGestureTextWrapper"
-                                          Grid.Column="2"
-                                          Visibility="Collapsed">
-                                        <TextBlock Visibility="{TemplateBinding InputGestureText, Converter={StaticResource StringIsEmptyVisibilityConverter}}"
-                                                   Margin="16 0 0 0"
-                                                   VerticalAlignment="Center" HorizontalAlignment="Right"
-                                                   Text="{TemplateBinding InputGestureText}"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                   Foreground="{TemplateBinding Foreground}"/>
+                                    <Grid
+                                        x:Name="InputGestureTextWrapper"
+                                        Grid.Column="2"
+                                        Visibility="Collapsed">
+                                        <TextBlock
+                                            Visibility="{TemplateBinding InputGestureText, Converter={StaticResource StringIsEmptyVisibilityConverter}}"
+                                            Margin="16 0 0 0"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Right"
+                                            Text="{TemplateBinding InputGestureText}"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                            Foreground="{TemplateBinding Foreground}" />
                                     </Grid>
-                                    <Grid x:Name="SubBlock"
-                                          Grid.Column="2"
-                                          Visibility="Collapsed"
-                                          Margin="16 0 0 0">
-                                        <Path Width="5" Height="10"
-                                              Stretch="Uniform"
-                                              HorizontalAlignment="Right"
-                                              VerticalAlignment="Center"
-                                              Data="M0,16 L8,8 L0,0 Z"
-                                              Fill="{TemplateBinding Foreground}"
-                                              SnapsToDevicePixels="False"/>
+                                    <Grid
+                                        x:Name="SubBlock"
+                                        Grid.Column="2"
+                                        Visibility="Collapsed"
+                                        Margin="16 0 0 0">
+                                        <Path
+                                            Width="5"
+                                            Height="10"
+                                            Stretch="Uniform"
+                                            HorizontalAlignment="Right"
+                                            VerticalAlignment="Center"
+                                            Data="M0,16 L8,8 L0,0 Z"
+                                            Fill="{TemplateBinding Foreground}"
+                                            SnapsToDevicePixels="False" />
                                     </Grid>
                                 </Grid>
                             </Grid>
                         </wpf:Ripple>
-                        <Popup x:Name="PART_Popup"
-                               AllowsTransparency="True"
-                               Focusable="False"
-                               IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                               PopupAnimation="Slide"
-                               Placement="Bottom"
-                               CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
-                            <Border x:Name="SubMenuBorder"
-                                    Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=MenuBase}}"
-                                    Effect="{DynamicResource MaterialDesignShadowDepth1}"
-                                    CornerRadius="2">
+                        <Popup
+                            x:Name="PART_Popup"
+                            AllowsTransparency="True"
+                            Focusable="False"
+                            IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                            PopupAnimation="Slide"
+                            Placement="Bottom"
+                            CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
+                            <Border
+                                x:Name="SubMenuBorder"
+                                Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=MenuBase}}"
+                                Effect="{DynamicResource MaterialDesignShadowDepth1}"
+                                CornerRadius="2">
 
-                                <Border Background="Transparent">
-                                    <ScrollViewer x:Name="SubMenuScrollViewer" Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">
-                                        <Grid RenderOptions.ClearTypeHint="Enabled" Margin="0 16">
-                                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-                                                <Rectangle x:Name="OpaqueRect"
-                                                           Fill="{Binding Background, ElementName=SubMenuBorder}"
-                                                           Height="{Binding ActualHeight, ElementName=SubMenuBorder}"
-                                                           Width="{Binding ActualWidth, ElementName=SubMenuBorder}"/>
+                                <Border
+                                    Background="Transparent">
+                                    <ScrollViewer
+                                        x:Name="SubMenuScrollViewer"
+                                        Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">
+                                        <Grid
+                                            RenderOptions.ClearTypeHint="Enabled"
+                                            Margin="0 16">
+                                            <Canvas
+                                                HorizontalAlignment="Left"
+                                                Height="0"
+                                                VerticalAlignment="Top"
+                                                Width="0">
+                                                <Rectangle
+                                                    x:Name="OpaqueRect"
+                                                    Fill="{Binding Background, ElementName=SubMenuBorder}"
+                                                    Height="{Binding ActualHeight, ElementName=SubMenuBorder}"
+                                                    Width="{Binding ActualWidth, ElementName=SubMenuBorder}" />
                                             </Canvas>
-                                            <ItemsPresenter x:Name="ItemsPresenter"
-                                                            KeyboardNavigation.DirectionalNavigation="Cycle"
-                                                            Grid.IsSharedSizeScope="True"
-                                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                            KeyboardNavigation.TabNavigation="Cycle"/>
+                                            <ItemsPresenter
+                                                x:Name="ItemsPresenter"
+                                                KeyboardNavigation.DirectionalNavigation="Cycle"
+                                                Grid.IsSharedSizeScope="True"
+                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                KeyboardNavigation.TabNavigation="Cycle" />
                                         </Grid>
                                     </ScrollViewer>
                                 </Border>
@@ -236,68 +285,174 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <!--#region Roles Triggers -->
-                        <Trigger Property="Role" Value="SubmenuHeader">
-                            <Setter TargetName="SubBlock" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="PART_Popup" Property="Placement" Value="Right" />
-                            <Setter TargetName="PART_Popup" Property="VerticalOffset" Value="-16" />
-                            <Setter Property="Height" Value="32"/>
-                            <Setter TargetName="BoldHeaderPresenter" Property="Visibility" Value="Collapsed"/>
+                        <Trigger
+                            Property="Role"
+                            Value="SubmenuHeader">
+                            <Setter
+                                TargetName="SubBlock"
+                                Property="Visibility"
+                                Value="Visible" />
+                            <Setter
+                                TargetName="PART_Popup"
+                                Property="Placement"
+                                Value="Right" />
+                            <Setter
+                                TargetName="PART_Popup"
+                                Property="VerticalOffset"
+                                Value="-16" />
+                            <Setter
+                                Property="Height"
+                                Value="32" />
+                            <Setter
+                                TargetName="BoldHeaderPresenter"
+                                Property="Visibility"
+                                Value="Collapsed" />
                         </Trigger>
-                        <Trigger Property="Role" Value="SubmenuItem">
-                            <Setter Property="Height" Value="32"/>
-                            <Setter TargetName="InputGestureTextWrapper" Property="Visibility" Value="Visible"/>
-                            <Setter TargetName="BoldHeaderPresenter" Property="Visibility" Value="Collapsed"/>
+                        <Trigger
+                            Property="Role"
+                            Value="SubmenuItem">
+                            <Setter
+                                Property="Height"
+                                Value="32" />
+                            <Setter
+                                TargetName="InputGestureTextWrapper"
+                                Property="Visibility"
+                                Value="Visible" />
+                            <Setter
+                                TargetName="BoldHeaderPresenter"
+                                Property="Visibility"
+                                Value="Collapsed" />
                         </Trigger>
-                        <Trigger Property="Role" Value="TopLevelHeader">
-                            <Setter Property="Grid.IsSharedSizeScope" Value="True"/>
-                            <Setter Property="Padding" Value="16 0"/>
-                            <Setter Property="Height" Value="48"/>
-                            <Setter TargetName="templateRoot" Property="CornerRadius" Value="2"/>
-                            <Setter TargetName="BackgroundRoot" Property="CornerRadius" Value="2"/>
+                        <Trigger
+                            Property="Role"
+                            Value="TopLevelHeader">
+                            <Setter
+                                Property="Grid.IsSharedSizeScope"
+                                Value="True" />
+                            <Setter
+                                Property="Padding"
+                                Value="16 0" />
+                            <Setter
+                                Property="Height"
+                                Value="48" />
+                            <Setter
+                                TargetName="templateRoot"
+                                Property="CornerRadius"
+                                Value="2" />
+                            <Setter
+                                TargetName="BackgroundRoot"
+                                Property="CornerRadius"
+                                Value="2" />
                         </Trigger>
-                        <Trigger Property="Role" Value="TopLevelItem">
-                            <Setter Property="Padding" Value="16 0"/>
-                            <Setter Property="Height" Value="48"/>
-                            <Setter TargetName="templateRoot" Property="CornerRadius" Value="2"/>
-                            <Setter TargetName="BackgroundRoot" Property="CornerRadius" Value="2"/>
+                        <Trigger
+                            Property="Role"
+                            Value="TopLevelItem">
+                            <Setter
+                                Property="Padding"
+                                Value="16 0" />
+                            <Setter
+                                Property="Height"
+                                Value="48" />
+                            <Setter
+                                TargetName="templateRoot"
+                                Property="CornerRadius"
+                                Value="2" />
+                            <Setter
+                                TargetName="BackgroundRoot"
+                                Property="CornerRadius"
+                                Value="2" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Role" Value="TopLevelHeader"/>
-                                <Condition Property="IsSubmenuOpen" Value="True"/>
+                                <Condition
+                                    Property="Role"
+                                    Value="TopLevelHeader" />
+                                <Condition
+                                    Property="IsSubmenuOpen"
+                                    Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="HeaderPresenter" Property="TextBlock.FontWeight" Value="Bold"/>
+                                <Setter
+                                    TargetName="HeaderPresenter"
+                                    Property="TextBlock.FontWeight"
+                                    Value="Bold" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                         <!--#endregion-->
 
-                        <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="True">
-                            <Setter TargetName="SubMenuBorder" Property="Margin" Value="5"/>
+                        <Trigger
+                            Property="HasDropShadow"
+                            SourceName="PART_Popup"
+                            Value="True">
+                            <Setter
+                                TargetName="SubMenuBorder"
+                                Property="Margin"
+                                Value="5" />
                         </Trigger>
 
-                        <Trigger Property="IsSuspendingPopupAnimation" Value="True">
-                            <Setter Property="PopupAnimation" TargetName="PART_Popup" Value="None"/>
+                        <Trigger
+                            Property="IsSuspendingPopupAnimation"
+                            Value="True">
+                            <Setter
+                                Property="PopupAnimation"
+                                TargetName="PART_Popup"
+                                Value="None" />
                         </Trigger>
-                        <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter Property="Visibility" TargetName="IconWrapper" Value="Collapsed"/>
+                        <Trigger
+                            Property="Icon"
+                            Value="{x:Null}">
+                            <Setter
+                                Property="Visibility"
+                                TargetName="IconWrapper"
+                                Value="Collapsed" />
                         </Trigger>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible"/>
+                        <Trigger
+                            Property="IsChecked"
+                            Value="True">
+                            <Setter
+                                Property="Visibility"
+                                TargetName="GlyphPanel"
+                                Value="Visible" />
                         </Trigger>
-                        <Trigger Property="IsCheckable" Value="True">
-                            <Setter Property="Visibility" TargetName="GlyphWrapper" Value="Visible"/>
-                            <Setter Property="Visibility" TargetName="IconWrapper" Value="Collapsed"/>
+                        <Trigger
+                            Property="IsCheckable"
+                            Value="True">
+                            <Setter
+                                Property="Visibility"
+                                TargetName="GlyphWrapper"
+                                Value="Visible" />
+                            <Setter
+                                Property="Visibility"
+                                TargetName="IconWrapper"
+                                Value="Collapsed" />
                         </Trigger>
-                        <Trigger Property="IsHighlighted" Value="True">
-                            <Setter TargetName="BackgroundRoot" Property="Opacity" Value="0.13"/>
+                        <Trigger
+                            Property="IsHighlighted"
+                            Value="True">
+                            <Setter
+                                TargetName="BackgroundRoot"
+                                Property="Opacity"
+                                Value="0.13" />
                         </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" Value=".56"/>
+                        <Trigger
+                            Property="IsEnabled"
+                            Value="False">
+                            <Setter
+                                Property="Opacity"
+                                Value=".56" />
                         </Trigger>
-                        <Trigger Property="CanContentScroll" SourceName="SubMenuScrollViewer" Value="False">
-                            <Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=SubMenuScrollViewer}"/>
-                            <Setter Property="Canvas.Left" TargetName="OpaqueRect" Value="{Binding HorizontalOffset, ElementName=SubMenuScrollViewer}"/>
+                        <Trigger
+                            Property="CanContentScroll"
+                            SourceName="SubMenuScrollViewer"
+                            Value="False">
+                            <Setter
+                                Property="Canvas.Top"
+                                TargetName="OpaqueRect"
+                                Value="{Binding VerticalOffset, ElementName=SubMenuScrollViewer}" />
+                            <Setter
+                                Property="Canvas.Left"
+                                TargetName="OpaqueRect"
+                                Value="{Binding HorizontalOffset, ElementName=SubMenuScrollViewer}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -305,17 +460,126 @@
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static wpf:Spelling.SuggestionMenuItemStyleKey}"  TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}">
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Header" Value="{Binding RelativeSource={RelativeSource Self}, Path=CommandParameter}" />
+    <Style
+        x:Key="MaterialDesignMenu"
+        TargetType="{x:Type MenuBase}">
+        <Style.Resources>
+            <Style
+                TargetType="MenuItem"
+                BasedOn="{StaticResource MaterialDesignMenuItem}" />
+        </Style.Resources>
+
+        <Setter
+            Property="Background"
+            Value="{DynamicResource MaterialDesignPaper}" />
+        <Setter
+            Property="FontFamily"
+            Value="{StaticResource MaterialDesignFont}" />
+        <Setter
+            Property="Foreground"
+            Value="{DynamicResource MaterialDesignBody}" />
+        <Setter
+            Property="TextBlock.FontSize"
+            Value="15" />
+        <Setter
+            Property="VerticalContentAlignment"
+            Value="Center" />
+        <Setter
+            Property="UseLayoutRounding"
+            Value="True" />
+        <Setter
+            Property="Template">
+            <Setter.Value>
+                <ControlTemplate
+                    TargetType="{x:Type MenuBase}">
+                    <Border
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Background="{TemplateBinding Background}"
+                        Padding="{TemplateBinding Padding}"
+                        SnapsToDevicePixels="true">
+                        <ItemsPresenter
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style
+        x:Key="MaterialDesignContextMenu"
+        TargetType="{x:Type ContextMenu}"
+        BasedOn="{StaticResource MaterialDesignMenu}">
+        <Setter
+            Property="Template">
+            <Setter.Value>
+                <ControlTemplate
+                    TargetType="{x:Type MenuBase}">
+                    <AdornerDecorator
+                        CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
+                        <Grid>
+                            <Border
+                                Background="{TemplateBinding Background}"
+                                Margin="3"
+                                CornerRadius="2"
+                                Effect="{DynamicResource MaterialDesignShadowDepth1}"></Border>
+
+                            <Border
+                                Margin="3"
+                                Background="Transparent">
+                                <ScrollViewer
+                                    x:Name="SubMenuScrollViewer"
+                                    Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">
+                                    <Grid
+                                        RenderOptions.ClearTypeHint="Enabled"
+                                        Margin="0 16">
+                                        <ItemsPresenter
+                                            x:Name="ItemsPresenter"
+                                            KeyboardNavigation.DirectionalNavigation="Cycle"
+                                            Grid.IsSharedSizeScope="True"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                            KeyboardNavigation.TabNavigation="Cycle" />
+                                    </Grid>
+                                </ScrollViewer>
+                            </Border>
+                        </Grid>
+                    </AdornerDecorator>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <Style
+        x:Key="{x:Static wpf:Spelling.SuggestionMenuItemStyleKey}"
+        TargetType="{x:Type MenuItem}"
+        BasedOn="{StaticResource MaterialDesignMenuItem}">
+        <Setter
+            Property="FontWeight"
+            Value="Bold" />
+        <Setter
+            Property="Header"
+            Value="{Binding RelativeSource={RelativeSource Self}, Path=CommandParameter}" />
     </Style>
 
-    <Style x:Key="{x:Static wpf:Spelling.IgnoreAllMenuItemStyleKey}"  TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}">
-        <Setter Property="Header" Value="Ignore All" />
+    <Style
+        x:Key="{x:Static wpf:Spelling.IgnoreAllMenuItemStyleKey}"
+        TargetType="{x:Type MenuItem}"
+        BasedOn="{StaticResource MaterialDesignMenuItem}">
+        <Setter
+            Property="Header"
+            Value="Ignore All" />
     </Style>
 
-    <Style x:Key="{x:Static wpf:Spelling.NoSuggestionsMenuItemStyleKey}" TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}">
-        <Setter Property="Header" Value="(no spelling suggestions)" />
-        <Setter Property="IsEnabled" Value="False" />
+    <Style
+        x:Key="{x:Static wpf:Spelling.NoSuggestionsMenuItemStyleKey}"
+        TargetType="{x:Type MenuItem}"
+        BasedOn="{StaticResource MaterialDesignMenuItem}">
+        <Setter
+            Property="Header"
+            Value="(no spelling suggestions)" />
+        <Setter
+            Property="IsEnabled"
+            Value="False" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml
index 60037d67e3..68a7a0c0cf 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml
@@ -1,103 +1,194 @@
-<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">
+<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">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.CheckBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ComboBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Menu.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.RadioButton.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Shadows.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ToggleButton.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Font.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ListBox.xaml" />
+        <ResourceDictionary
+            Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.CheckBox.xaml" />
+        <ResourceDictionary
+            Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ComboBox.xaml" />
+        <ResourceDictionary
+            Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Menu.xaml" />
+        <ResourceDictionary
+            Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.RadioButton.xaml" />
+        <ResourceDictionary
+            Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Shadows.xaml" />
+        <ResourceDictionary
+            Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBox.xaml" />
+        <ResourceDictionary
+            Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
+        <ResourceDictionary
+            Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ToggleButton.xaml" />
+        <ResourceDictionary
+            Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Font.xaml" />
+        <ResourceDictionary
+            Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ListBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-    
-    <Style x:Key="MaterialDesignToolBarVerticalOverflowButtonStyle" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Background" Value="{DynamicResource MaterialDesignToolBarBackground}"/>
-        <Setter Property="MinHeight" Value="0"/>
-        <Setter Property="MinWidth" Value="0"/>
-        <Setter Property="Template">
+    <BooleanToVisibilityConverter
+        x:Key="BooleanToVisibilityConverter" />
+
+    <Style
+        x:Key="MaterialDesignToolBarVerticalOverflowButtonStyle"
+        TargetType="{x:Type ToggleButton}">
+        <Setter
+            Property="Background"
+            Value="{DynamicResource MaterialDesignToolBarBackground}" />
+        <Setter
+            Property="MinHeight"
+            Value="0" />
+        <Setter
+            Property="MinWidth"
+            Value="0" />
+        <Setter
+            Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Border x:Name="Bd" Background="{TemplateBinding Background}" CornerRadius="0,0,3,3" SnapsToDevicePixels="true">
-                        <Viewbox Width="16" Height="16">
-                            <Canvas Width="24" Height="24">
-                                <Path Data="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z" Fill="{TemplateBinding Foreground}" />
+                <ControlTemplate
+                    TargetType="{x:Type ToggleButton}">
+                    <Border
+                        x:Name="Bd"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="0,0,3,3"
+                        SnapsToDevicePixels="true">
+                        <Viewbox
+                            Width="16"
+                            Height="16">
+                            <Canvas
+                                Width="24"
+                                Height="24">
+                                <Path
+                                    Data="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z"
+                                    Fill="{TemplateBinding Foreground}" />
                             </Canvas>
                         </Viewbox>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="true">
+                        <Trigger
+                            Property="IsMouseOver"
+                            Value="true">
                             <!--Setter Property="Background" TargetName="Bd" Value="{StaticResource ToolBarButtonHover}"/-->
                         </Trigger>
-                        <Trigger Property="IsKeyboardFocused" Value="true">
+                        <Trigger
+                            Property="IsKeyboardFocused"
+                            Value="true">
                             <!--Setter Property="Background" TargetName="Bd" Value="{StaticResource ToolBarButtonHover}"/-->
                         </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Opacity" Value=".56"/>
+                        <Trigger
+                            Property="IsEnabled"
+                            Value="false">
+                            <Setter
+                                Property="Opacity"
+                                Value=".56" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Style.Triggers>
-            <DataTrigger Binding="{Binding Source={x:Static SystemParameters.HighContrast}}" Value="true">
-                <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+            <DataTrigger
+                Binding="{Binding Source={x:Static SystemParameters.HighContrast}}"
+                Value="true">
+                <Setter
+                    Property="Background"
+                    Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
-    
-    <Style x:Key="MaterialDesignToolBarHorizontalOverflowButtonStyle" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Background" Value="{DynamicResource MaterialDesignToolBarBackground}"/>
-        <Setter Property="MinHeight" Value="0"/>
-        <Setter Property="MinWidth" Value="0"/>
-        <Setter Property="Template">
+
+    <Style
+        x:Key="MaterialDesignToolBarHorizontalOverflowButtonStyle"
+        TargetType="{x:Type ToggleButton}">
+        <Setter
+            Property="Background"
+            Value="{DynamicResource MaterialDesignToolBarBackground}" />
+        <Setter
+            Property="MinHeight"
+            Value="0" />
+        <Setter
+            Property="MinWidth"
+            Value="0" />
+        <Setter
+            Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Border x:Name="Bd" Background="{TemplateBinding Background}" CornerRadius="0,3,3,0" SnapsToDevicePixels="true">
-                        <Viewbox Width="16" Height="16" Margin="8 0 8 0">
-                            <Canvas Width="24" Height="24">
-                                <Path Data="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z" Fill="{TemplateBinding Foreground}" />
+                <ControlTemplate
+                    TargetType="{x:Type ToggleButton}">
+                    <Border
+                        x:Name="Bd"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="0,3,3,0"
+                        SnapsToDevicePixels="true">
+                        <Viewbox
+                            Width="16"
+                            Height="16"
+                            Margin="8 0 8 0">
+                            <Canvas
+                                Width="24"
+                                Height="24">
+                                <Path
+                                    Data="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z"
+                                    Fill="{TemplateBinding Foreground}" />
                             </Canvas>
                         </Viewbox>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="true">
+                        <Trigger
+                            Property="IsMouseOver"
+                            Value="true">
                             <!--Setter Property="Background" TargetName="Bd" Value="{StaticResource ToolBarButtonHover}"/-->
                         </Trigger>
-                        <Trigger Property="IsKeyboardFocused" Value="true">
+                        <Trigger
+                            Property="IsKeyboardFocused"
+                            Value="true">
                             <!--Setter Property="Background" TargetName="Bd" Value="{StaticResource ToolBarButtonHover}"/-->
                         </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Opacity" Value=".56"/>
+                        <Trigger
+                            Property="IsEnabled"
+                            Value="false">
+                            <Setter
+                                Property="Opacity"
+                                Value=".56" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Style.Triggers>
-            <DataTrigger Binding="{Binding Source={x:Static SystemParameters.HighContrast}}" Value="true">
-                <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+            <DataTrigger
+                Binding="{Binding Source={x:Static SystemParameters.HighContrast}}"
+                Value="true">
+                <Setter
+                    Property="Background"
+                    Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
-    
-    <Style x:Key="MaterialDesignToolBarThumbStyle" TargetType="{x:Type Thumb}">
-        <Setter Property="Template">
+
+    <Style
+        x:Key="MaterialDesignToolBarThumbStyle"
+        TargetType="{x:Type Thumb}">
+        <Setter
+            Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Background="Transparent" SnapsToDevicePixels="True" Padding="{TemplateBinding Padding}">
+                <ControlTemplate
+                    TargetType="{x:Type Thumb}">
+                    <Border
+                        Background="Transparent"
+                        SnapsToDevicePixels="True"
+                        Padding="{TemplateBinding Padding}">
                         <Rectangle>
                             <Rectangle.Fill>
-                                <DrawingBrush TileMode="Tile" Viewbox="0,0,4,4" Viewport="0,0,4,4" ViewportUnits="Absolute" ViewboxUnits="Absolute">
+                                <DrawingBrush
+                                    TileMode="Tile"
+                                    Viewbox="0,0,4,4"
+                                    Viewport="0,0,4,4"
+                                    ViewportUnits="Absolute"
+                                    ViewboxUnits="Absolute">
                                     <DrawingBrush.Drawing>
                                         <DrawingGroup>
-                                            <GeometryDrawing Brush="{DynamicResource MaterialDesignDivider}" Geometry="M 0 0 L 0 2 L 2 2 L 2 0 z"/>
+                                            <GeometryDrawing
+                                                Brush="{DynamicResource MaterialDesignDivider}"
+                                                Geometry="M 0 0 L 0 2 L 2 2 L 2 0 z" />
                                         </DrawingGroup>
                                     </DrawingBrush.Drawing>
                                 </DrawingBrush>
@@ -105,109 +196,277 @@
                         </Rectangle>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="Cursor" Value="SizeAll"/>
+                        <Trigger
+                            Property="IsMouseOver"
+                            Value="true">
+                            <Setter
+                                Property="Cursor"
+                                Value="SizeAll" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-    
-    <Style x:Key="MaterialDesignToolBarMainPanelBorderStyle" TargetType="{x:Type Border}">
-        <Setter Property="Margin" Value="0,0,11,0"/>
-        <Setter Property="CornerRadius" Value="3,3,3,3"/>
+
+    <Style
+        x:Key="MaterialDesignToolBarMainPanelBorderStyle"
+        TargetType="{x:Type Border}">
+        <Setter
+            Property="Margin"
+            Value="0,0,11,0" />
+        <Setter
+            Property="CornerRadius"
+            Value="3,3,3,3" />
     </Style>
-    
-    <Style x:Key="MaterialDesignToolBar" TargetType="{x:Type ToolBar}">
-        <Setter Property="Background" Value="{DynamicResource MaterialDesignToolBarBackground}"/>
-        <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}"/>
-        <Setter Property="ClipToBounds" Value="True"/>
-        <Setter Property="Template">
+
+    <Style
+        x:Key="MaterialDesignToolBar"
+        TargetType="{x:Type ToolBar}">
+        <Setter
+            Property="Background"
+            Value="{DynamicResource MaterialDesignToolBarBackground}" />
+        <Setter
+            Property="Foreground"
+            Value="{DynamicResource MaterialDesignBody}" />
+        <Setter
+            Property="ClipToBounds"
+            Value="True" />
+        <Setter
+            Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToolBar}">
+                <ControlTemplate
+                    TargetType="{x:Type ToolBar}">
                     <ControlTemplate.Resources>
-                        <Style TargetType="{x:Type wpf:PackIcon}" >
-                            <Setter Property="FrameworkElement.Width" Value="22" />
-                            <Setter Property="FrameworkElement.Height" Value="22" />
+                        <Style
+                            TargetType="{x:Type wpf:PackIcon}">
+                            <Setter
+                                Property="FrameworkElement.Width"
+                                Value="22" />
+                            <Setter
+                                Property="FrameworkElement.Height"
+                                Value="22" />
                         </Style>
-                        <Style TargetType="ListBox" BasedOn="{StaticResource MaterialDesignToolToggleFlatListBox}">
-                            <Setter Property="ItemContainerStyle">
+                        <Style
+                            TargetType="ListBox"
+                            BasedOn="{StaticResource MaterialDesignToolToggleFlatListBox}">
+                            <Setter
+                                Property="ItemContainerStyle">
                                 <Setter.Value>
-                                    <Style TargetType="ListBoxItem" BasedOn="{StaticResource MaterialDesignToolToggleListBoxItem}">
-                                        <Setter Property="TextBlock.FontWeight" Value="DemiBold"/>
-                                        <Setter Property="TextBlock.FontSize" Value="18"/>
-                                        <Setter Property="MinWidth" Value="54"/>
-                                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                                        <Setter Property="Padding" Value="16" />
+                                    <Style
+                                        TargetType="ListBoxItem"
+                                        BasedOn="{StaticResource MaterialDesignToolToggleListBoxItem}">
+                                        <Setter
+                                            Property="TextBlock.FontWeight"
+                                            Value="DemiBold" />
+                                        <Setter
+                                            Property="TextBlock.FontSize"
+                                            Value="18" />
+                                        <Setter
+                                            Property="MinWidth"
+                                            Value="54" />
+                                        <Setter
+                                            Property="HorizontalContentAlignment"
+                                            Value="Center" />
+                                        <Setter
+                                            Property="Padding"
+                                            Value="16" />
                                     </Style>
                                 </Setter.Value>
                             </Setter>
                         </Style>
                     </ControlTemplate.Resources>
-                    <DockPanel x:Name="Grid" Margin="3,1,1,1" SnapsToDevicePixels="true" Background="{TemplateBinding Background}">
-                        <Grid DockPanel.Dock="Right" x:Name="OverflowGrid" HorizontalAlignment="Right">
-                            <ToggleButton x:Name="OverflowButton" ClickMode="Press" FocusVisualStyle="{x:Null}" 
-                                          IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" 
-                                          Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=HasOverflowItems, Converter={StaticResource BooleanToVisibilityConverter}}" 
-                                          Style="{StaticResource MaterialDesignToolBarHorizontalOverflowButtonStyle}"
-                                          Foreground="{TemplateBinding Foreground}"
-                                          />
-                            <Popup x:Name="OverflowPopup" AllowsTransparency="true" Focusable="false" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom" StaysOpen="false" Margin="1">
+                    <DockPanel
+                        x:Name="Grid"
+                        Margin="3,1,1,1"
+                        SnapsToDevicePixels="true"
+                        Background="{TemplateBinding Background}">
+                        <Grid
+                            DockPanel.Dock="Right"
+                            x:Name="OverflowGrid"
+                            HorizontalAlignment="Right">
+                            <ToggleButton
+                                x:Name="OverflowButton"
+                                ClickMode="Press"
+                                FocusVisualStyle="{x:Null}"
+                                IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=HasOverflowItems, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                Style="{StaticResource MaterialDesignToolBarHorizontalOverflowButtonStyle}"
+                                Foreground="{TemplateBinding Foreground}" />
+                            <Popup
+                                x:Name="OverflowPopup"
+                                AllowsTransparency="true"
+                                Focusable="false"
+                                IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
+                                Placement="Bottom"
+                                StaysOpen="false"
+                                Margin="1">
                                 <!-- warning, this will cache the inner item as well, consider separating the shadow from the item if possible -->
                                 <Popup.CacheMode>
-                                    <BitmapCache EnableClearType="True" SnapsToDevicePixels="True"/>
+                                    <BitmapCache
+                                        EnableClearType="True"
+                                        SnapsToDevicePixels="True" />
                                 </Popup.CacheMode>
-                                <Border x:Name="ToolBarSubMenuBorder" BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="1" Background="{DynamicResource MaterialDesignToolBarBackground}"
-                                                TextBlock.FontWeight="ExtraBold"
-                                                CornerRadius="2" Margin="1"
-                                                Effect="{StaticResource MaterialDesignShadowDepth2}" RenderOptions.ClearTypeHint="Enabled">
-                                    <Border Background="Transparent">
-                                        <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" KeyboardNavigation.DirectionalNavigation="Cycle" FocusVisualStyle="{x:Null}" Focusable="true" Margin="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" WrapWidth="200"/>
+                                <Border
+                                    x:Name="ToolBarSubMenuBorder"
+                                    BorderBrush="{DynamicResource MaterialDesignDivider}"
+                                    BorderThickness="1"
+                                    Background="{DynamicResource MaterialDesignToolBarBackground}"
+                                    TextBlock.FontWeight="ExtraBold"
+                                    CornerRadius="2"
+                                    Margin="1"
+                                    Effect="{StaticResource MaterialDesignShadowDepth2}"
+                                    RenderOptions.ClearTypeHint="Enabled">
+                                    <Border
+                                        Background="Transparent">
+                                        <ToolBarOverflowPanel
+                                            x:Name="PART_ToolBarOverflowPanel"
+                                            KeyboardNavigation.DirectionalNavigation="Cycle"
+                                            FocusVisualStyle="{x:Null}"
+                                            Focusable="true"
+                                            Margin="2"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                            KeyboardNavigation.TabNavigation="Cycle"
+                                            WrapWidth="200" />
                                     </Border>
                                 </Border>
                             </Popup>
                         </Grid>
-                        <Border x:Name="MainPanelBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" Style="{StaticResource MaterialDesignToolBarMainPanelBorderStyle}">
-                            <DockPanel KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
-                                <Thumb x:Name="ToolBarThumb" Margin="-3,-1,4,0" Padding="6,5,1,3" Style="{StaticResource MaterialDesignToolBarThumbStyle}" Width="10"/>
-                                <ContentPresenter x:Name="ToolBarHeader" ContentSource="Header" HorizontalAlignment="Center" Margin="4,0,4,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
-                                <ToolBarPanel x:Name="PART_ToolBarPanel" IsItemsHost="true" Margin="0,0,2,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        <Border
+                            x:Name="MainPanelBorder"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Background="{TemplateBinding Background}"
+                            Padding="{TemplateBinding Padding}"
+                            Style="{StaticResource MaterialDesignToolBarMainPanelBorderStyle}">
+                            <DockPanel
+                                KeyboardNavigation.TabIndex="1"
+                                KeyboardNavigation.TabNavigation="Local">
+                                <Thumb
+                                    x:Name="ToolBarThumb"
+                                    Margin="-3,-1,4,0"
+                                    Padding="6,5,1,3"
+                                    Style="{StaticResource MaterialDesignToolBarThumbStyle}"
+                                    Width="10" />
+                                <ContentPresenter
+                                    x:Name="ToolBarHeader"
+                                    ContentSource="Header"
+                                    HorizontalAlignment="Center"
+                                    Margin="4,0,4,0"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                    VerticalAlignment="Center" />
+                                <ToolBarPanel
+                                    x:Name="PART_ToolBarPanel"
+                                    IsItemsHost="true"
+                                    Margin="0,0,2,0"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </DockPanel>
                         </Border>
                     </DockPanel>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsOverflowOpen" Value="true">
-                            <Setter Property="IsEnabled" TargetName="ToolBarThumb" Value="false"/>
+                        <Trigger
+                            Property="IsOverflowOpen"
+                            Value="true">
+                            <Setter
+                                Property="IsEnabled"
+                                TargetName="ToolBarThumb"
+                                Value="false" />
                         </Trigger>
-                        <Trigger Property="Header" Value="{x:Null}">
-                            <Setter Property="Visibility" TargetName="ToolBarHeader" Value="Collapsed"/>
+                        <Trigger
+                            Property="Header"
+                            Value="{x:Null}">
+                            <Setter
+                                Property="Visibility"
+                                TargetName="ToolBarHeader"
+                                Value="Collapsed" />
                         </Trigger>
-                        <Trigger Property="ToolBarTray.IsLocked" Value="true">
-                            <Setter Property="Visibility" TargetName="ToolBarThumb" Value="Collapsed"/>
+                        <Trigger
+                            Property="ToolBarTray.IsLocked"
+                            Value="true">
+                            <Setter
+                                Property="Visibility"
+                                TargetName="ToolBarThumb"
+                                Value="Collapsed" />
                         </Trigger>
-                        <Trigger Property="HasDropShadow" SourceName="OverflowPopup" Value="true">
-                            <Setter Property="Margin" TargetName="ToolBarSubMenuBorder" Value="5,5,5,5"/>
+                        <Trigger
+                            Property="HasDropShadow"
+                            SourceName="OverflowPopup"
+                            Value="true">
+                            <Setter
+                                Property="Margin"
+                                TargetName="ToolBarSubMenuBorder"
+                                Value="5,5,5,5" />
                         </Trigger>
-                        <Trigger Property="Orientation" Value="Vertical">
-                            <Setter Property="Margin" TargetName="Grid" Value="1,3,1,1"/>
-                            <Setter Property="Style" TargetName="OverflowButton" Value="{StaticResource MaterialDesignToolBarVerticalOverflowButtonStyle}"/>
-                            <Setter Property="Height" TargetName="ToolBarThumb" Value="10"/>
-                            <Setter Property="Width" TargetName="ToolBarThumb" Value="Auto"/>
-                            <Setter Property="Margin" TargetName="ToolBarThumb" Value="-1,-3,0,0"/>
-                            <Setter Property="Padding" TargetName="ToolBarThumb" Value="5,6,6,1"/>
-                            <Setter Property="Margin" TargetName="ToolBarHeader" Value="0,0,0,4"/>
-                            <Setter Property="Margin" TargetName="PART_ToolBarPanel" Value="1,0,2,2"/>
-                            <Setter Property="DockPanel.Dock" TargetName="ToolBarThumb" Value="Top"/>
-                            <Setter Property="DockPanel.Dock" TargetName="ToolBarHeader" Value="Top"/>
-                            <Setter Property="HorizontalAlignment" TargetName="OverflowGrid" Value="Stretch"/>
-                            <Setter Property="VerticalAlignment" TargetName="OverflowGrid" Value="Bottom"/>
-                            <Setter Property="Placement" TargetName="OverflowPopup" Value="Right"/>
-                            <Setter Property="Margin" TargetName="MainPanelBorder" Value="0,0,0,11"/>
-                            <Setter Property="Background" Value="{DynamicResource MaterialDesignToolBarBackground}"/>
+                        <Trigger
+                            Property="Orientation"
+                            Value="Vertical">
+                            <Setter
+                                Property="Margin"
+                                TargetName="Grid"
+                                Value="1,3,1,1" />
+                            <Setter
+                                Property="Style"
+                                TargetName="OverflowButton"
+                                Value="{StaticResource MaterialDesignToolBarVerticalOverflowButtonStyle}" />
+                            <Setter
+                                Property="Height"
+                                TargetName="ToolBarThumb"
+                                Value="10" />
+                            <Setter
+                                Property="Width"
+                                TargetName="ToolBarThumb"
+                                Value="Auto" />
+                            <Setter
+                                Property="Margin"
+                                TargetName="ToolBarThumb"
+                                Value="-1,-3,0,0" />
+                            <Setter
+                                Property="Padding"
+                                TargetName="ToolBarThumb"
+                                Value="5,6,6,1" />
+                            <Setter
+                                Property="Margin"
+                                TargetName="ToolBarHeader"
+                                Value="0,0,0,4" />
+                            <Setter
+                                Property="Margin"
+                                TargetName="PART_ToolBarPanel"
+                                Value="1,0,2,2" />
+                            <Setter
+                                Property="DockPanel.Dock"
+                                TargetName="ToolBarThumb"
+                                Value="Top" />
+                            <Setter
+                                Property="DockPanel.Dock"
+                                TargetName="ToolBarHeader"
+                                Value="Top" />
+                            <Setter
+                                Property="HorizontalAlignment"
+                                TargetName="OverflowGrid"
+                                Value="Stretch" />
+                            <Setter
+                                Property="VerticalAlignment"
+                                TargetName="OverflowGrid"
+                                Value="Bottom" />
+                            <Setter
+                                Property="Placement"
+                                TargetName="OverflowPopup"
+                                Value="Right" />
+                            <Setter
+                                Property="Margin"
+                                TargetName="MainPanelBorder"
+                                Value="0,0,0,11" />
+                            <Setter
+                                Property="Background"
+                                Value="{DynamicResource MaterialDesignToolBarBackground}" />
                         </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Opacity" Value=".56"/>
+                        <Trigger
+                            Property="IsEnabled"
+                            Value="false">
+                            <Setter
+                                Property="Opacity"
+                                Value=".56" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -215,65 +474,148 @@
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static ToolBar.CheckBoxStyleKey}" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource MaterialDesignCheckBox}">
-        <Setter Property="Margin" Value="8 0 8 0" />
+    <Style
+        x:Key="{x:Static ToolBar.CheckBoxStyleKey}"
+        TargetType="{x:Type CheckBox}"
+        BasedOn="{StaticResource MaterialDesignCheckBox}">
+        <Setter
+            Property="Margin"
+            Value="8 0 8 0" />
     </Style>
-    <Style x:Key="{x:Static ToolBar.ComboBoxStyleKey}" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource MaterialDesignComboBox}">
-        <Setter Property="Margin" Value="8 0 8 0" />
+    <Style
+        x:Key="{x:Static ToolBar.ComboBoxStyleKey}"
+        TargetType="{x:Type ComboBox}"
+        BasedOn="{StaticResource MaterialDesignComboBox}">
+        <Setter
+            Property="Margin"
+            Value="8 0 8 0" />
     </Style>
-    <Style x:Key="{x:Static ToolBar.MenuStyleKey}" TargetType="{x:Type Menu}" BasedOn="{StaticResource MaterialDesignMenu}">
-        <Setter Property="Margin" Value="8 0 8 0" />
+    <Style
+        x:Key="{x:Static ToolBar.MenuStyleKey}"
+        BasedOn="{StaticResource MaterialDesignMenu}"
+        TargetType="{x:Type Menu}">
+        <Setter
+            Property="Margin"
+            Value="8 0 8 0" />
     </Style>
-    <Style x:Key="{x:Static ToolBar.RadioButtonStyleKey}" TargetType="{x:Type RadioButton}" BasedOn="{StaticResource MaterialDesignRadioButton}">
-        <Setter Property="Margin" Value="8 0 8 0" />
+    <Style
+        x:Key="{x:Static ToolBar.RadioButtonStyleKey}"
+        TargetType="{x:Type RadioButton}"
+        BasedOn="{StaticResource MaterialDesignRadioButton}">
+        <Setter
+            Property="Margin"
+            Value="8 0 8 0" />
     </Style>
-    <Style x:Key="{x:Static ToolBar.SeparatorStyleKey}" TargetType="Separator">
-        <Setter Property="Background" Value="{DynamicResource MaterialDesignDivider}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignDivider}"/>
-        <Setter Property="MinHeight" Value="1"/>
-        <Setter Property="Margin" Value="6 11 6 11"/>
-        <Setter Property="SnapsToDevicePixels" Value="true"/>
-        <Setter Property="Template">
+    <Style
+        x:Key="{x:Static ToolBar.SeparatorStyleKey}"
+        TargetType="Separator">
+        <Setter
+            Property="Background"
+            Value="{DynamicResource MaterialDesignDivider}" />
+        <Setter
+            Property="BorderBrush"
+            Value="{DynamicResource MaterialDesignDivider}" />
+        <Setter
+            Property="MinHeight"
+            Value="1" />
+        <Setter
+            Property="Margin"
+            Value="6 11 6 11" />
+        <Setter
+            Property="SnapsToDevicePixels"
+            Value="true" />
+        <Setter
+            Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Separator}">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+                <ControlTemplate
+                    TargetType="{x:Type Separator}">
+                    <Border
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Background="{TemplateBinding Background}" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-    <Style x:Key="{x:Static ToolBar.TextBoxStyleKey}" TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignTextBox}">
-        <Setter Property="Margin" Value="8 0 8 0" />
+    <Style
+        x:Key="{x:Static ToolBar.TextBoxStyleKey}"
+        TargetType="{x:Type TextBox}"
+        BasedOn="{StaticResource MaterialDesignTextBox}">
+        <Setter
+            Property="Margin"
+            Value="8 0 8 0" />
     </Style>
-    <Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MaterialDesignSwitchToggleButton}">
-        <Setter Property="Margin" Value="8 0 8 0" />
+    <Style
+        x:Key="{x:Static ToolBar.ToggleButtonStyleKey}"
+        TargetType="{x:Type ToggleButton}"
+        BasedOn="{StaticResource MaterialDesignSwitchToggleButton}">
+        <Setter
+            Property="Margin"
+            Value="8 0 8 0" />
     </Style>
 
-    <Style x:Key="{x:Static ToolBar.ButtonStyleKey}" TargetType="Button">
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="16"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="TextBlock.FontWeight" Value="DemiBold"/>
-        <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}"/>
-        <Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource MaterialDesignFlatButtonRipple}" />
-        <Setter Property="Template">
+    <Style
+        x:Key="{x:Static ToolBar.ButtonStyleKey}"
+        TargetType="Button">
+        <Setter
+            Property="BorderThickness"
+            Value="1" />
+        <Setter
+            Property="Padding"
+            Value="16" />
+        <Setter
+            Property="HorizontalContentAlignment"
+            Value="Center" />
+        <Setter
+            Property="VerticalContentAlignment"
+            Value="Center" />
+        <Setter
+            Property="TextBlock.FontWeight"
+            Value="DemiBold" />
+        <Setter
+            Property="Foreground"
+            Value="{DynamicResource MaterialDesignBody}" />
+        <Setter
+            Property="wpf:RippleAssist.Feedback"
+            Value="{DynamicResource MaterialDesignFlatButtonRipple}" />
+        <Setter
+            Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}" >
-                    <Border Background="Transparent" x:Name="border" CornerRadius="2">
-                        <wpf:Ripple Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False"
-                                Feedback="{TemplateBinding Foreground}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Padding="{TemplateBinding Padding}" 
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                <ControlTemplate
+                    TargetType="{x:Type Button}">
+                    <Border
+                        Background="Transparent"
+                        x:Name="border"
+                        CornerRadius="2">
+                        <wpf:Ripple
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Focusable="False"
+                            Feedback="{TemplateBinding Foreground}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Opacity" Value=".56"/>
+                        <Trigger
+                            Property="IsEnabled"
+                            Value="false">
+                            <Setter
+                                Property="Opacity"
+                                Value=".56" />
                         </Trigger>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource MaterialDesignFlatButtonClick}"/>
-                            <Setter Property="Background" TargetName="border" Value="{DynamicResource MaterialDesignFlatButtonClick}"/>
+                        <Trigger
+                            Property="IsMouseOver"
+                            Value="true">
+                            <Setter
+                                Property="BorderBrush"
+                                TargetName="border"
+                                Value="{DynamicResource MaterialDesignFlatButtonClick}" />
+                            <Setter
+                                Property="Background"
+                                TargetName="border"
+                                Value="{DynamicResource MaterialDesignFlatButtonClick}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>