From f391c61869442c8032f10adf98305cb8b36a5e26 Mon Sep 17 00:00:00 2001
From: mOlDaViA <crayzyone@gmail.com>
Date: Mon, 10 Jun 2024 10:36:30 +0200
Subject: [PATCH 1/4] Added the HorizontalIconAlignment property. You can now
 choose, if you want to show the icon left or right to the content.

---
 src/Wpf.Ui/Controls/Button/Button.cs   |  34 ++-
 src/Wpf.Ui/Controls/Button/Button.xaml | 285 +++++++++++++++----------
 2 files changed, 201 insertions(+), 118 deletions(-)

diff --git a/src/Wpf.Ui/Controls/Button/Button.cs b/src/Wpf.Ui/Controls/Button/Button.cs
index fd14c98fa..f59fccf74 100644
--- a/src/Wpf.Ui/Controls/Button/Button.cs
+++ b/src/Wpf.Ui/Controls/Button/Button.cs
@@ -13,16 +13,16 @@ namespace Wpf.Ui.Controls;
 /// </summary>
 /// <example>
 /// <code lang="xml">
-/// &lt;ui:Button
+/// <ui:Button
 ///     Appearance="Primary"
 ///     Content="WPF UI button with font icon"
-///     Icon="{ui:SymbolIcon Symbol=Fluent24}" /&gt;
+///     Icon="{ui:SymbolIcon Symbol=Fluent24}" />
 /// </code>
 /// <code lang="xml">
-/// &lt;ui:Button
+/// <ui:Button
 ///     Appearance="Primary"
 ///     Content="WPF UI button with font icon"
-///     Icon="{ui:FontIcon '&#x1F308;'}" /&gt;
+///     Icon="{ui:FontIcon Glyph='&#x1F308;'}"/>
 /// </code>
 /// </example>
 /// <remarks>
@@ -100,6 +100,13 @@ public class Button : System.Windows.Controls.Button, IAppearanceControl, IIconC
         )
     );
 
+    /// <summary>Identifies the <see cref="HorizontalIconAlignment"/> dependency property.</summary>
+    public static readonly DependencyProperty HorizontalIconAlignmentProperty = DependencyProperty.Register(
+        nameof(HorizontalIconAlignment),
+        typeof(HorizontalIconAlignments),
+        typeof(Button),
+        new PropertyMetadata(HorizontalIconAlignments.Left));
+
     /// <summary>
     /// Gets or sets displayed <see cref="IconElement"/>.
     /// </summary>
@@ -181,6 +188,21 @@ public Brush PressedBorderBrush
     public CornerRadius CornerRadius
     {
         get => (CornerRadius)GetValue(CornerRadiusProperty);
-        set => SetValue(CornerRadiusProperty, (object)value);
+        set => SetValue(CornerRadiusProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets whether the icon should be shown left or right from the content.
+    /// </summary>
+    public HorizontalIconAlignments HorizontalIconAlignment
+    {
+        get => (HorizontalIconAlignments)GetValue(HorizontalIconAlignmentProperty);
+        set => SetValue(HorizontalIconAlignmentProperty, value);
+    }
+
+    public enum HorizontalIconAlignments
+    {
+        Left,
+        Right
     }
-}
+}
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/Button/Button.xaml b/src/Wpf.Ui/Controls/Button/Button.xaml
index 7214b0114..e52790206 100644
--- a/src/Wpf.Ui/Controls/Button/Button.xaml
+++ b/src/Wpf.Ui/Controls/Button/Button.xaml
@@ -11,30 +11,34 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    >
 
     <Thickness x:Key="ButtonPadding">11,5,11,6</Thickness>
     <Thickness x:Key="ButtonBorderThemeThickness">1</Thickness>
-    <Thickness x:Key="ButtonIconMargin">0,0,8,0</Thickness>
+    <!--<Thickness x:Key="ButtonIconMargin">0,0,8,0</Thickness>-->
 
-    <Style x:Key="DefaultButtonStyle" TargetType="{x:Type Button}">
+    <Style
+        x:Key="DefaultButtonStyle"
+        TargetType="{x:Type Button}"
+        >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource ButtonBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource ButtonBackground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource ButtonBorderThemeThickness}"/>
+        <Setter Property="Padding" Value="{StaticResource ButtonPadding}"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
@@ -50,16 +54,18 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}">
+                        CornerRadius="{TemplateBinding Border.CornerRadius}"
+                        >
                         <ContentPresenter
                             x:Name="ContentPresenter"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
-                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                            TextElement.Foreground="{TemplateBinding Foreground}"
+                            />
 
-                        <!--
+                        <!-- TODO: Is this still necessary?
                         Without the hacky workaround for the themes, we cannot use the freezable VisualState.
 
                         <VisualStateManager.VisualStateGroups>
@@ -110,19 +116,19 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
+                            <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPointerOver}"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+                            <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}"/>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
+                            <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPressed}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -130,30 +136,33 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultUiButtonStyle" TargetType="{x:Type controls:Button}">
+    <Style
+        x:Key="DefaultUiButtonStyle"
+        TargetType="{x:Type controls:Button}"
+        >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
-        <Setter Property="MouseOverBackground" Value="{DynamicResource ButtonBackgroundPointerOver}" />
-        <Setter Property="PressedBackground" Value="{DynamicResource ButtonBackgroundPressed}" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
-        <Setter Property="PressedForeground" Value="{DynamicResource ButtonForegroundPressed}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="PressedBorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
-        <Setter Property="MouseOverBorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource ButtonBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="Appearance" Value="Secondary" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource ButtonBackground}"/>
+        <Setter Property="MouseOverBackground" Value="{DynamicResource ButtonBackgroundPointerOver}"/>
+        <Setter Property="PressedBackground" Value="{DynamicResource ButtonBackgroundPressed}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}"/>
+        <Setter Property="PressedForeground" Value="{DynamicResource ButtonForegroundPressed}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="PressedBorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}"/>
+        <Setter Property="MouseOverBorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource ButtonBorderThemeThickness}"/>
+        <Setter Property="Padding" Value="{StaticResource ButtonPadding}"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="Appearance" Value="Secondary"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:Button}">
@@ -166,74 +175,96 @@
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                         VerticalAlignment="{TemplateBinding VerticalAlignment}"
                         Background="{TemplateBinding Background}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        >
                         <Border
                             Padding="{TemplateBinding Padding}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}">
-                            <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            >
+                            <Grid
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                >
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition
+                                        x:Name="Column0"
+                                        Width="Auto"
+                                        />
+                                    <ColumnDefinition
+                                        x:Name="Column1"
+                                        Width="Auto"
+                                        />
                                 </Grid.ColumnDefinitions>
 
                                 <ContentPresenter
                                     x:Name="ControlIcon"
                                     Grid.Column="0"
-                                    Margin="{StaticResource ButtonIconMargin}"
                                     VerticalAlignment="Center"
                                     Content="{TemplateBinding Icon}"
                                     ContentTemplate="{TemplateBinding ContentTemplate}"
                                     Focusable="False"
                                     TextElement.FontSize="{TemplateBinding FontSize}"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                                    TextElement.Foreground="{TemplateBinding Foreground}"
+                                    />
 
                                 <ContentPresenter
                                     x:Name="ContentPresenter"
                                     Grid.Column="1"
                                     VerticalAlignment="Center"
                                     Content="{TemplateBinding Content}"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                                    TextElement.Foreground="{TemplateBinding Foreground}"
+                                    />
                             </Grid>
                         </Border>
                     </Border>
                     <ControlTemplate.Triggers>
+                        <Trigger Property="HorizontalIconAlignment" Value="Left">
+                            <Setter TargetName="ControlIcon" Property="Grid.Column" Value="0"/>
+                            <Setter TargetName="ContentPresenter" Property="Grid.Column" Value="1"/>
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0,0,8,0"/>
+                        </Trigger>
+                        <Trigger Property="HorizontalIconAlignment" Value="Right">
+                            <Setter TargetName="ControlIcon" Property="Grid.Column" Value="1"/>
+                            <Setter TargetName="ContentPresenter" Property="Grid.Column" Value="0"/>
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="8,0,0,0"/>
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsPressed" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsPressed" Value="False"/>
                             </MultiTrigger.Conditions>
                             <!--<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding MouseOverForeground, RelativeSource={RelativeSource TemplatedParent}}" />
                             <Setter TargetName="ControlIcon" Property="TextElement.Foreground" Value="{Binding MouseOverForeground, RelativeSource={RelativeSource TemplatedParent}}" />-->
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsPressed" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsPressed" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{Binding PressedBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{Binding PressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding PressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Setter TargetName="ControlIcon" Property="TextElement.Foreground" Value="{Binding PressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{Binding PressedBackground, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{Binding PressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding PressedForeground, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="ControlIcon" Property="TextElement.Foreground" Value="{Binding PressedForeground, RelativeSource={RelativeSource TemplatedParent}}"/>
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
-                            <Setter TargetName="ControlIcon" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}"/>
+                            <Setter TargetName="ControlIcon" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}"/>
                         </Trigger>
                         <Trigger Property="Content" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Content" Value="">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
-                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
+                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -242,45 +273,45 @@
         <Style.Triggers>
             <!--  TRANSPARENT  -->
             <Trigger Property="Appearance" Value="Transparent">
-                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="Background" Value="Transparent"/>
             </Trigger>
 
             <!--  PRIMARY  -->
             <Trigger Property="Appearance" Value="Primary">
-                <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
-                <Setter Property="MouseOverBackground" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
-                <Setter Property="PressedBackground" Value="{DynamicResource AccentButtonBackgroundPressed}" />
-                <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
-                <Setter Property="PressedForeground" Value="{DynamicResource AccentButtonForegroundPointerOver}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource AccentControlElevationBorderBrush}" />
-                <Setter Property="PressedBorderBrush" Value="{DynamicResource AccentButtonBorderBrushPressed}" />
+                <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}"/>
+                <Setter Property="MouseOverBackground" Value="{DynamicResource AccentButtonBackgroundPointerOver}"/>
+                <Setter Property="PressedBackground" Value="{DynamicResource AccentButtonBackgroundPressed}"/>
+                <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}"/>
+                <Setter Property="PressedForeground" Value="{DynamicResource AccentButtonForegroundPointerOver}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource AccentControlElevationBorderBrush}"/>
+                <Setter Property="PressedBorderBrush" Value="{DynamicResource AccentButtonBorderBrushPressed}"/>
             </Trigger>
 
             <!--  DARK  -->
             <Trigger Property="Appearance" Value="Dark">
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource ControlStrongFillColorDark}" />
+                        <SolidColorBrush Color="{DynamicResource ControlStrongFillColorDark}"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="MouseOverBackground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#62000000" />
+                        <SolidColorBrush Color="#62000000"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="PressedBackground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#52000000" />
+                        <SolidColorBrush Color="#52000000"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorLightPrimary}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorLightPrimary}"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="PressedForeground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorLightSecondary}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorLightSecondary}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -289,27 +320,27 @@
             <Trigger Property="Appearance" Value="Light">
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource ControlStrongFillColorLight}" />
+                        <SolidColorBrush Color="{DynamicResource ControlStrongFillColorLight}"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="MouseOverBackground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#D3FFFFFF" />
+                        <SolidColorBrush Color="#D3FFFFFF"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="PressedBackground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#F3FFFFFF" />
+                        <SolidColorBrush Color="#F3FFFFFF"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorDarkPrimary}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorDarkPrimary}"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="PressedForeground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorDarkSecondary}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorDarkSecondary}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -318,22 +349,28 @@
             <Trigger Property="Appearance" Value="Info">
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource PaletteLightBlueColor}" />
+                        <SolidColorBrush Color="{DynamicResource PaletteLightBlueColor}"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="MouseOverBackground">
                     <Setter.Value>
-                        <SolidColorBrush Opacity="0.9" Color="{DynamicResource PaletteLightBlueColor}" />
+                        <SolidColorBrush
+                            Opacity="0.9"
+                            Color="{DynamicResource PaletteLightBlueColor}"
+                            />
                     </Setter.Value>
                 </Setter>
                 <Setter Property="PressedBackground">
                     <Setter.Value>
-                        <SolidColorBrush Opacity="0.7" Color="{DynamicResource PaletteLightBlueColor}" />
+                        <SolidColorBrush
+                            Opacity="0.7"
+                            Color="{DynamicResource PaletteLightBlueColor}"
+                            />
                     </Setter.Value>
                 </Setter>
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorLightPrimary}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorLightPrimary}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -342,17 +379,23 @@
             <Trigger Property="Appearance" Value="Danger">
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource PaletteRedColor}" />
+                        <SolidColorBrush Color="{DynamicResource PaletteRedColor}"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="MouseOverBackground">
                     <Setter.Value>
-                        <SolidColorBrush Opacity="0.9" Color="{DynamicResource PaletteRedColor}" />
+                        <SolidColorBrush
+                            Opacity="0.9"
+                            Color="{DynamicResource PaletteRedColor}"
+                            />
                     </Setter.Value>
                 </Setter>
                 <Setter Property="PressedBackground">
                     <Setter.Value>
-                        <SolidColorBrush Opacity="0.7" Color="{DynamicResource PaletteRedColor}" />
+                        <SolidColorBrush
+                            Opacity="0.7"
+                            Color="{DynamicResource PaletteRedColor}"
+                            />
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -361,17 +404,23 @@
             <Trigger Property="Appearance" Value="Success">
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource PaletteGreenColor}" />
+                        <SolidColorBrush Color="{DynamicResource PaletteGreenColor}"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="MouseOverBackground">
                     <Setter.Value>
-                        <SolidColorBrush Opacity="0.9" Color="{DynamicResource PaletteGreenColor}" />
+                        <SolidColorBrush
+                            Opacity="0.9"
+                            Color="{DynamicResource PaletteGreenColor}"
+                            />
                     </Setter.Value>
                 </Setter>
                 <Setter Property="PressedBackground">
                     <Setter.Value>
-                        <SolidColorBrush Opacity="0.7" Color="{DynamicResource PaletteGreenColor}" />
+                        <SolidColorBrush
+                            Opacity="0.7"
+                            Color="{DynamicResource PaletteGreenColor}"
+                            />
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -380,24 +429,36 @@
             <Trigger Property="Appearance" Value="Caution">
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource PaletteOrangeColor}" />
+                        <SolidColorBrush Color="{DynamicResource PaletteOrangeColor}"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="MouseOverBackground">
                     <Setter.Value>
-                        <SolidColorBrush Opacity="0.9" Color="{DynamicResource PaletteOrangeColor}" />
+                        <SolidColorBrush
+                            Opacity="0.9"
+                            Color="{DynamicResource PaletteOrangeColor}"
+                            />
                     </Setter.Value>
                 </Setter>
                 <Setter Property="PressedBackground">
                     <Setter.Value>
-                        <SolidColorBrush Opacity="0.7" Color="{DynamicResource PaletteOrangeColor}" />
+                        <SolidColorBrush
+                            Opacity="0.7"
+                            Color="{DynamicResource PaletteOrangeColor}"
+                            />
                     </Setter.Value>
                 </Setter>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="{x:Type Button}" />
-    <Style BasedOn="{StaticResource DefaultUiButtonStyle}" TargetType="{x:Type controls:Button}" />
+    <Style
+        BasedOn="{StaticResource DefaultButtonStyle}"
+        TargetType="{x:Type Button}"
+        />
+    <Style
+        BasedOn="{StaticResource DefaultUiButtonStyle}"
+        TargetType="{x:Type controls:Button}"
+        />
 
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file

From c45f931f5e46a81505d7731903c28ea325c29107 Mon Sep 17 00:00:00 2001
From: mOlDaViA <crayzyone@gmail.com>
Date: Fri, 21 Jun 2024 02:45:54 +0200
Subject: [PATCH 2/4] Fixed a couple of things here: 1. FonIcon/SymbolIcon
 markup now fully supports fontsize. Setting the fontsize in the markup will
 be prioritized over inheriance.

2. Using Content="Text" in the UiButton class can now format the string from inheritance.
Right now it is not possible to do this for the Button class as it breaks the direct string rendering.
Formating text in seperate child elements such as TextBlock does not inheritance as it is not possible to get both working right now.
So better we use this method to format strings because we can alwasys format any TextBlock on it's own inside the UiButton.

3. Moved IconAlignment into IconElement folder and added VerticalIconAlignment as possibility.
Docs added (check them, maybe you don't like them)

4. Added a border to the Slider style for visual value feedback.

5. Refactored the SystemThemeManager class.
Using SystemUsesLightTheme is unnecessary since the app theme is the only one necessary variable we need.
If the system uses light theme withouth seperating the app theme, SystemUsesLightTheme will always return 1 and vice versa.
We should also take into account if people change their app theme separately and base it on that one.
---
 src/Wpf.Ui/Appearance/SystemThemeManager.cs   |  72 +---
 src/Wpf.Ui/Controls/Button/Button.cs          |  22 +-
 src/Wpf.Ui/Controls/Button/Button.xaml        | 239 +++++++-------
 .../Button/ButtonContentTemplateSelector.cs   |  24 ++
 .../Controls/IconElement/IconAlignment.cs     |  34 ++
 src/Wpf.Ui/Controls/Slider/Slider.xaml        | 310 +++++++++++-------
 .../Slider/SliderThumbPositionConverter.cs    |  22 ++
 src/Wpf.Ui/Markup/FontIconExtension.cs        |  76 ++++-
 src/Wpf.Ui/Markup/SymbolIconExtension.cs      |  54 ++-
 9 files changed, 518 insertions(+), 335 deletions(-)
 create mode 100644 src/Wpf.Ui/Controls/Button/ButtonContentTemplateSelector.cs
 create mode 100644 src/Wpf.Ui/Controls/IconElement/IconAlignment.cs
 create mode 100644 src/Wpf.Ui/Controls/Slider/SliderThumbPositionConverter.cs

diff --git a/src/Wpf.Ui/Appearance/SystemThemeManager.cs b/src/Wpf.Ui/Appearance/SystemThemeManager.cs
index f14f33f33..ffc7fac94 100644
--- a/src/Wpf.Ui/Appearance/SystemThemeManager.cs
+++ b/src/Wpf.Ui/Appearance/SystemThemeManager.cs
@@ -61,32 +61,22 @@ private static SystemTheme GetCurrentSystemTheme()
     {
         var currentTheme =
             Registry.GetValue(
-                "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes",
+                @"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes",
                 "CurrentTheme",
                 "aero.theme"
             ) as string
             ?? string.Empty;
 
+        var appUsesLightTheme = Registry.GetValue(
+            @"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize",
+            "AppsUseLightTheme",
+            1
+        );
+
         if (!string.IsNullOrEmpty(currentTheme))
         {
             currentTheme = currentTheme.ToLower().Trim();
 
-            // This may be changed in the next versions, check the Insider previews
-            if (currentTheme.Contains("basic.theme"))
-            {
-                return SystemTheme.Light;
-            }
-
-            if (currentTheme.Contains("aero.theme"))
-            {
-                return SystemTheme.Light;
-            }
-
-            if (currentTheme.Contains("dark.theme"))
-            {
-                return SystemTheme.Dark;
-            }
-
             if (currentTheme.Contains("hcblack.theme"))
             {
                 return SystemTheme.HCBlack;
@@ -106,52 +96,8 @@ private static SystemTheme GetCurrentSystemTheme()
             {
                 return SystemTheme.HC2;
             }
-
-            if (currentTheme.Contains("themea.theme"))
-            {
-                return SystemTheme.Glow;
-            }
-
-            if (currentTheme.Contains("themeb.theme"))
-            {
-                return SystemTheme.CapturedMotion;
-            }
-
-            if (currentTheme.Contains("themec.theme"))
-            {
-                return SystemTheme.Sunrise;
-            }
-
-            if (currentTheme.Contains("themed.theme"))
-            {
-                return SystemTheme.Flow;
-            }
-        }
-
-        /*if (currentTheme.Contains("custom.theme"))
-            return ; custom can be light or dark*/
-        var rawAppsUseLightTheme = Registry.GetValue(
-            "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
-            "AppsUseLightTheme",
-            1
-        );
-
-        if (rawAppsUseLightTheme is 0)
-        {
-            return SystemTheme.Dark;
         }
-        else if (rawAppsUseLightTheme is 1)
-        {
-            return SystemTheme.Light;
-        }
-
-        var rawSystemUsesLightTheme =
-            Registry.GetValue(
-                "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
-                "SystemUsesLightTheme",
-                1
-            ) ?? 1;
 
-        return rawSystemUsesLightTheme is 0 ? SystemTheme.Dark : SystemTheme.Light;
+        return appUsesLightTheme is 1 ? SystemTheme.Light : SystemTheme.Dark;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/Button/Button.cs b/src/Wpf.Ui/Controls/Button/Button.cs
index f59fccf74..b81ec64b5 100644
--- a/src/Wpf.Ui/Controls/Button/Button.cs
+++ b/src/Wpf.Ui/Controls/Button/Button.cs
@@ -13,16 +13,16 @@ namespace Wpf.Ui.Controls;
 /// </summary>
 /// <example>
 /// <code lang="xml">
-/// <ui:Button
+/// &lt;ui:Button
 ///     Appearance="Primary"
 ///     Content="WPF UI button with font icon"
-///     Icon="{ui:SymbolIcon Symbol=Fluent24}" />
+///     Icon="{ui:SymbolIcon Symbol=Fluent24}" /&gt;
 /// </code>
 /// <code lang="xml">
-/// <ui:Button
+/// &lt;ui:Button
 ///     Appearance="Primary"
 ///     Content="WPF UI button with font icon"
-///     Icon="{ui:FontIcon Glyph='&#x1F308;'}"/>
+///     Icon="{ui:FontIcon Glyph='&#x1F308;'}"/&gt;
 /// </code>
 /// </example>
 /// <remarks>
@@ -103,9 +103,9 @@ public class Button : System.Windows.Controls.Button, IAppearanceControl, IIconC
     /// <summary>Identifies the <see cref="HorizontalIconAlignment"/> dependency property.</summary>
     public static readonly DependencyProperty HorizontalIconAlignmentProperty = DependencyProperty.Register(
         nameof(HorizontalIconAlignment),
-        typeof(HorizontalIconAlignments),
+        typeof(HorizontalIconAlignment),
         typeof(Button),
-        new PropertyMetadata(HorizontalIconAlignments.Left));
+        new PropertyMetadata(HorizontalIconAlignment.Left));
 
     /// <summary>
     /// Gets or sets displayed <see cref="IconElement"/>.
@@ -194,15 +194,9 @@ public CornerRadius CornerRadius
     /// <summary>
     /// Gets or sets whether the icon should be shown left or right from the content.
     /// </summary>
-    public HorizontalIconAlignments HorizontalIconAlignment
+    public HorizontalIconAlignment HorizontalIconAlignment
     {
-        get => (HorizontalIconAlignments)GetValue(HorizontalIconAlignmentProperty);
+        get => (HorizontalIconAlignment)GetValue(HorizontalIconAlignmentProperty);
         set => SetValue(HorizontalIconAlignmentProperty, value);
     }
-
-    public enum HorizontalIconAlignments
-    {
-        Left,
-        Right
-    }
 }
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/Button/Button.xaml b/src/Wpf.Ui/Controls/Button/Button.xaml
index e52790206..45bc2b5d4 100644
--- a/src/Wpf.Ui/Controls/Button/Button.xaml
+++ b/src/Wpf.Ui/Controls/Button/Button.xaml
@@ -8,20 +8,32 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    >
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Thickness x:Key="ButtonPadding">11,5,11,6</Thickness>
-    <Thickness x:Key="ButtonBorderThemeThickness">1</Thickness>
-    <!--<Thickness x:Key="ButtonIconMargin">0,0,8,0</Thickness>-->
+    <Thickness x:Key="ButtonPadding">
+        11,5,11,6
+    </Thickness>
+    <Thickness x:Key="ButtonBorderThemeThickness">
+        1
+    </Thickness>
 
-    <Style
-        x:Key="DefaultButtonStyle"
-        TargetType="{x:Type Button}"
-        >
+    <DataTemplate x:Key="StringDataTemplate">
+        <TextBlock FontSize="{Binding FontSize, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Button}}}"
+                   Foreground="{Binding Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Button}}}"
+                   Text="{Binding Content, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Button}}}"
+                   />
+    </DataTemplate>
+
+    <controls:ButtonContentTemplateSelector x:Key="ButtonContentTemplateSelector"
+                                            StringDataTemplate="{StaticResource StringDataTemplate}"
+                                            />
+
+    <Style x:Key="DefaultButtonStyle"
+           TargetType="{x:Type Button}"
+           >
         <!--  Universal WPF UI focus  -->
         <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
@@ -42,30 +54,28 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
-                    <Border
-                        x:Name="ContentBorder"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        MinWidth="{TemplateBinding MinWidth}"
-                        MinHeight="{TemplateBinding MinHeight}"
-                        Padding="{TemplateBinding Padding}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}"
-                        >
-                        <ContentPresenter
-                            x:Name="ContentPresenter"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            TextElement.Foreground="{TemplateBinding Foreground}"
-                            />
-
-                        <!-- TODO: Is this still necessary?
+                    <Border x:Name="ContentBorder"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                            >
+                        <!--  TODO: Working out the reason why the StringDataTemplate does not work for this particular ContentPresenter.  -->
+                        <!--  TODO: Right now removed as it would break the ability to use direct strings.  -->
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          />
+                        <!--
                         Without the hacky workaround for the themes, we cannot use the freezable VisualState.
 
                         <VisualStateManager.VisualStateGroups>
@@ -136,10 +146,9 @@
         </Setter>
     </Style>
 
-    <Style
-        x:Key="DefaultUiButtonStyle"
-        TargetType="{x:Type controls:Button}"
-        >
+    <Style x:Key="DefaultUiButtonStyle"
+           TargetType="{x:Type controls:Button}"
+           >
         <!--  Universal WPF UI focus  -->
         <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
@@ -166,56 +175,50 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:Button}">
-                    <Border
-                        x:Name="ContentBorder"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        MinWidth="{TemplateBinding MinWidth}"
-                        MinHeight="{TemplateBinding MinHeight}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="{TemplateBinding Background}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        >
-                        <Border
-                            Padding="{TemplateBinding Padding}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
+                    <Border x:Name="ContentBorder"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Background="{TemplateBinding Background}"
                             CornerRadius="{TemplateBinding CornerRadius}"
                             >
-                            <Grid
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                        <Border Padding="{TemplateBinding Padding}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding CornerRadius}"
                                 >
+                            <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  >
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition
-                                        x:Name="Column0"
-                                        Width="Auto"
-                                        />
-                                    <ColumnDefinition
-                                        x:Name="Column1"
-                                        Width="Auto"
-                                        />
+                                    <ColumnDefinition x:Name="Column0"
+                                                      Width="Auto"
+                                                      />
+                                    <ColumnDefinition x:Name="Column1"
+                                                      Width="Auto"
+                                                      />
                                 </Grid.ColumnDefinitions>
 
-                                <ContentPresenter
-                                    x:Name="ControlIcon"
-                                    Grid.Column="0"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Icon}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    Focusable="False"
-                                    TextElement.FontSize="{TemplateBinding FontSize}"
-                                    TextElement.Foreground="{TemplateBinding Foreground}"
-                                    />
+                                <ContentPresenter x:Name="ControlIcon"
+                                                  Grid.Column="0"
+                                                  VerticalAlignment="Center"
+                                                  Content="{TemplateBinding Icon}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  Focusable="False"
+                                                  TextElement.FontSize="{TemplateBinding FontSize}"
+                                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                                  />
 
-                                <ContentPresenter
-                                    x:Name="ContentPresenter"
-                                    Grid.Column="1"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Content}"
-                                    TextElement.Foreground="{TemplateBinding Foreground}"
-                                    />
+                                <ContentPresenter x:Name="ContentPresenter"
+                                                  Grid.Column="1"
+                                                  VerticalAlignment="Center"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{StaticResource ButtonContentTemplateSelector}"
+                                                  />
                             </Grid>
                         </Border>
                     </Border>
@@ -354,18 +357,16 @@
                 </Setter>
                 <Setter Property="MouseOverBackground">
                     <Setter.Value>
-                        <SolidColorBrush
-                            Opacity="0.9"
-                            Color="{DynamicResource PaletteLightBlueColor}"
-                            />
+                        <SolidColorBrush Opacity="0.9"
+                                         Color="{DynamicResource PaletteLightBlueColor}"
+                                         />
                     </Setter.Value>
                 </Setter>
                 <Setter Property="PressedBackground">
                     <Setter.Value>
-                        <SolidColorBrush
-                            Opacity="0.7"
-                            Color="{DynamicResource PaletteLightBlueColor}"
-                            />
+                        <SolidColorBrush Opacity="0.7"
+                                         Color="{DynamicResource PaletteLightBlueColor}"
+                                         />
                     </Setter.Value>
                 </Setter>
                 <Setter Property="Foreground">
@@ -384,18 +385,16 @@
                 </Setter>
                 <Setter Property="MouseOverBackground">
                     <Setter.Value>
-                        <SolidColorBrush
-                            Opacity="0.9"
-                            Color="{DynamicResource PaletteRedColor}"
-                            />
+                        <SolidColorBrush Opacity="0.9"
+                                         Color="{DynamicResource PaletteRedColor}"
+                                         />
                     </Setter.Value>
                 </Setter>
                 <Setter Property="PressedBackground">
                     <Setter.Value>
-                        <SolidColorBrush
-                            Opacity="0.7"
-                            Color="{DynamicResource PaletteRedColor}"
-                            />
+                        <SolidColorBrush Opacity="0.7"
+                                         Color="{DynamicResource PaletteRedColor}"
+                                         />
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -409,18 +408,16 @@
                 </Setter>
                 <Setter Property="MouseOverBackground">
                     <Setter.Value>
-                        <SolidColorBrush
-                            Opacity="0.9"
-                            Color="{DynamicResource PaletteGreenColor}"
-                            />
+                        <SolidColorBrush Opacity="0.9"
+                                         Color="{DynamicResource PaletteGreenColor}"
+                                         />
                     </Setter.Value>
                 </Setter>
                 <Setter Property="PressedBackground">
                     <Setter.Value>
-                        <SolidColorBrush
-                            Opacity="0.7"
-                            Color="{DynamicResource PaletteGreenColor}"
-                            />
+                        <SolidColorBrush Opacity="0.7"
+                                         Color="{DynamicResource PaletteGreenColor}"
+                                         />
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -434,31 +431,27 @@
                 </Setter>
                 <Setter Property="MouseOverBackground">
                     <Setter.Value>
-                        <SolidColorBrush
-                            Opacity="0.9"
-                            Color="{DynamicResource PaletteOrangeColor}"
-                            />
+                        <SolidColorBrush Opacity="0.9"
+                                         Color="{DynamicResource PaletteOrangeColor}"
+                                         />
                     </Setter.Value>
                 </Setter>
                 <Setter Property="PressedBackground">
                     <Setter.Value>
-                        <SolidColorBrush
-                            Opacity="0.7"
-                            Color="{DynamicResource PaletteOrangeColor}"
-                            />
+                        <SolidColorBrush Opacity="0.7"
+                                         Color="{DynamicResource PaletteOrangeColor}"
+                                         />
                     </Setter.Value>
                 </Setter>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style
-        BasedOn="{StaticResource DefaultButtonStyle}"
-        TargetType="{x:Type Button}"
-        />
-    <Style
-        BasedOn="{StaticResource DefaultUiButtonStyle}"
-        TargetType="{x:Type controls:Button}"
-        />
+    <Style BasedOn="{StaticResource DefaultButtonStyle}"
+           TargetType="{x:Type Button}"
+           />
+    <Style BasedOn="{StaticResource DefaultUiButtonStyle}"
+           TargetType="{x:Type controls:Button}"
+           />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/Button/ButtonContentTemplateSelector.cs b/src/Wpf.Ui/Controls/Button/ButtonContentTemplateSelector.cs
new file mode 100644
index 000000000..b0b192d29
--- /dev/null
+++ b/src/Wpf.Ui/Controls/Button/ButtonContentTemplateSelector.cs
@@ -0,0 +1,24 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System.Windows.Controls;
+// ReSharper disable CheckNamespace
+
+namespace Wpf.Ui.Controls;
+
+public class ButtonContentTemplateSelector : DataTemplateSelector
+{ 
+    public DataTemplate? StringDataTemplate { get; set; }
+
+    public override DataTemplate? SelectTemplate(object? item, DependencyObject container)
+    {
+        if (container is ContentPresenter { ContentTemplate: not null } contentPresenter)
+        {
+            return contentPresenter.ContentTemplate;
+        }
+
+        return item is string ? StringDataTemplate : base.SelectTemplate(item, container);
+    }
+}
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/IconElement/IconAlignment.cs b/src/Wpf.Ui/Controls/IconElement/IconAlignment.cs
new file mode 100644
index 000000000..1d3b2384c
--- /dev/null
+++ b/src/Wpf.Ui/Controls/IconElement/IconAlignment.cs
@@ -0,0 +1,34 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+// ReSharper disable once CheckNamespace
+namespace Wpf.Ui.Controls;
+
+/// <summary>
+/// Defines the horizontal alignment of any <see cref="IconElement"/>.
+/// <para>Possible values are:</para>
+/// <para><see cref="Left"/></para>
+/// <para>and</para>
+/// <para><see cref="Right"/></para>
+/// </summary>
+public enum HorizontalIconAlignment
+{
+    Left,
+    Right
+}
+
+/// <summary>
+/// Defines the vertical alignment of any <see cref="IconElement"/>.
+/// <para>Possible values are:</para>
+/// <para><see cref="Top"/></para>
+/// <para>and</para>
+/// <para><see cref="Bottom"/></para>
+/// </summary>
+// In case we need it.
+public enum VerticalIconAlignment
+{
+    Top,
+    Bottom
+}
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/Slider/Slider.xaml b/src/Wpf.Ui/Controls/Slider/Slider.xaml
index 498eb70eb..d5a742daf 100644
--- a/src/Wpf.Ui/Controls/Slider/Slider.xaml
+++ b/src/Wpf.Ui/Controls/Slider/Slider.xaml
@@ -5,46 +5,54 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
+    <controls:SliderThumbPositionConverter x:Key="SliderThumbPositionConverter"/>
 
-    <Style x:Key="UiSliderButtonStyle" TargetType="{x:Type RepeatButton}">
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="UiSliderButtonStyle"
+           TargetType="{x:Type RepeatButton}"
+           >
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Border Background="Transparent" />
+                    <Border Background="Transparent"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="UiSliderThumbStyle" TargetType="{x:Type Thumb}">
-        <Setter Property="Height" Value="20" />
-        <Setter Property="Width" Value="20" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource SliderThumbBackground}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Background" Value="{DynamicResource SliderOuterThumbBackground}" />
+    <Style x:Key="UiSliderThumbStyle"
+           TargetType="{x:Type Thumb}"
+           >
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Width" Value="20"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource SliderThumbBackground}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Background" Value="{DynamicResource SliderOuterThumbBackground}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="16">
-                        <Ellipse
-                            x:Name="Ellipse"
-                            Width="12"
-                            Height="12"
-                            Fill="{TemplateBinding Foreground}"
-                            Stroke="Transparent"
-                            StrokeThickness="0" />
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="16"
+                            >
+                        <Ellipse x:Name="Ellipse"
+                                 Width="12"
+                                 Height="12"
+                                 Fill="{TemplateBinding Foreground}"
+                                 Stroke="Transparent"
+                                 StrokeThickness="0"
+                                 />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
@@ -52,145 +60,219 @@
     </Style>
 
     <!--  Template when the orientation of the Slider is Horizontal.  -->
-    <ControlTemplate x:Key="UiHorizontalSlider" TargetType="{x:Type Slider}">
+    <ControlTemplate x:Key="UiHorizontalSlider"
+                     TargetType="{x:Type Slider}"
+                     >
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"
+                               MinHeight="{TemplateBinding MinHeight}"
+                               />
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <TickBar
-                x:Name="TopTick"
-                Grid.Row="0"
-                Height="6"
-                Fill="{DynamicResource SliderTickBarFill}"
-                Placement="Top"
-                SnapsToDevicePixels="True"
-                Visibility="Collapsed" />
-            <Border
-                x:Name="TrackBackground"
-                Grid.Row="1"
-                Height="4"
-                Margin="0"
-                Background="{DynamicResource SliderTrackFill}"
-                BorderThickness="0"
-                CornerRadius="2" />
-            <Track x:Name="PART_Track" Grid.Row="1">
+            <TickBar x:Name="TopTick"
+                     Grid.Row="0"
+                     Height="6"
+                     Fill="{DynamicResource SliderTickBarFill}"
+                     Placement="Top"
+                     SnapsToDevicePixels="True"
+                     Visibility="Collapsed"
+                     />
+            <Border x:Name="TrackBackground"
+                    Grid.Row="1"
+                    Height="4"
+                    Margin="0"
+                    Background="{DynamicResource SliderTrackFill}"
+                    BorderThickness="0"
+                    CornerRadius="2"
+                    >
+                <Border Height="4"
+                        Margin="0"
+                        HorizontalAlignment="Left"
+                        BorderThickness="0"
+                        CornerRadius="2"
+                        Background="{DynamicResource SliderThumbBackground}"
+                        >
+                    <Border.Width>
+                        <MultiBinding Converter="{StaticResource SliderThumbPositionConverter}">
+                            <Binding ElementName="PART_Track"
+                                     Path="ActualWidth"
+                                     />
+                            <Binding ElementName="PART_Track"
+                                     Path="Value"
+                                     />
+                            <Binding ElementName="PART_Track"
+                                     Path="Minimum"
+                                     />
+                            <Binding ElementName="PART_Track"
+                                     Path="Maximum"
+                                     />
+                        </MultiBinding>
+                    </Border.Width>
+                </Border>
+            </Border>
+            <Track x:Name="PART_Track"
+                   Grid.Row="1"
+                   >
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Command="Slider.DecreaseLarge" Style="{StaticResource UiSliderButtonStyle}" />
+                    <RepeatButton Command="Slider.DecreaseLarge"
+                                  Style="{StaticResource UiSliderButtonStyle}"
+                                  />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Thumb x:Name="Thumb" Style="{StaticResource UiSliderThumbStyle}" />
+                    <Thumb x:Name="Thumb"
+                           Style="{StaticResource UiSliderThumbStyle}"
+                           />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Command="Slider.IncreaseLarge" Style="{StaticResource UiSliderButtonStyle}" />
+                    <RepeatButton Command="Slider.IncreaseLarge"
+                                  Style="{StaticResource UiSliderButtonStyle}"
+                                  />
                 </Track.IncreaseRepeatButton>
             </Track>
-            <TickBar
-                x:Name="BottomTick"
-                Grid.Row="2"
-                Height="6"
-                Fill="{DynamicResource SliderTickBarFill}"
-                Placement="Bottom"
-                SnapsToDevicePixels="True"
-                Visibility="Collapsed" />
+            <TickBar x:Name="BottomTick"
+                     Grid.Row="2"
+                     Height="6"
+                     Fill="{DynamicResource SliderTickBarFill}"
+                     Placement="Bottom"
+                     SnapsToDevicePixels="True"
+                     Visibility="Collapsed"
+                     />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="TickPlacement" Value="TopLeft">
-                <Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
+                <Setter TargetName="TopTick" Property="Visibility" Value="Visible"/>
             </Trigger>
             <Trigger Property="TickPlacement" Value="BottomRight">
-                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
+                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible"/>
             </Trigger>
             <Trigger Property="TickPlacement" Value="Both">
-                <Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
-                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
+                <Setter TargetName="TopTick" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="TrackBackground" Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
-                <Setter TargetName="Thumb" Property="Foreground" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+                <Setter TargetName="TrackBackground" Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}"/>
+                <Setter TargetName="Thumb" Property="Foreground" Value="{DynamicResource SliderThumbBackgroundPointerOver}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <!--  Template when the orientation of the Slider is Vertical.  -->
-    <ControlTemplate x:Key="UiVerticalSlider" TargetType="{x:Type Slider}">
+    <ControlTemplate x:Key="UiVerticalSlider"
+                     TargetType="{x:Type Slider}"
+                     >
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" MinWidth="{TemplateBinding MinWidth}" />
-                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"
+                                  MinWidth="{TemplateBinding MinWidth}"
+                                  />
+                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <TickBar
-                x:Name="TopTick"
-                Width="6"
-                Fill="{DynamicResource SliderTickBarFill}"
-                Placement="Left"
-                SnapsToDevicePixels="True"
-                Visibility="Collapsed" />
-            <Border
-                x:Name="TrackBackground"
-                Grid.Column="1"
-                Width="4"
-                Margin="0"
-                Background="{DynamicResource SliderTrackFill}"
-                BorderThickness="0"
-                CornerRadius="2" />
-
-            <Track x:Name="PART_Track" Grid.Column="1">
+            <TickBar x:Name="TopTick"
+                     Grid.Column="0"
+                     Width="6"
+                     Fill="{DynamicResource SliderTickBarFill}"
+                     Placement="Left"
+                     SnapsToDevicePixels="True"
+                     Visibility="Collapsed"
+                     />
+            <Border x:Name="TrackBackground"
+                    Grid.Column="1"
+                    Width="4"
+                    Margin="0"
+                    Background="{DynamicResource SliderTrackFill}"
+                    BorderThickness="0"
+                    CornerRadius="2"
+                    >
+                <Border Width="4"
+                        Margin="0"
+                        VerticalAlignment="Bottom"
+                        BorderThickness="0"
+                        CornerRadius="2"
+                        Background="{DynamicResource SliderThumbBackground}"
+                        >
+                    <Border.Height>
+                        <MultiBinding Converter="{StaticResource SliderThumbPositionConverter}">
+                            <Binding ElementName="PART_Track"
+                                     Path="ActualHeight"
+                                     />
+                            <Binding ElementName="PART_Track"
+                                     Path="Value"
+                                     />
+                            <Binding ElementName="PART_Track"
+                                     Path="Minimum"
+                                     />
+                            <Binding ElementName="PART_Track"
+                                     Path="Maximum"
+                                     />
+                        </MultiBinding>
+                    </Border.Height>
+                </Border>
+            </Border>
+            <Track x:Name="PART_Track"
+                   Grid.Column="1"
+                   >
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Command="Slider.DecreaseLarge" Style="{StaticResource UiSliderButtonStyle}" />
+                    <RepeatButton Command="Slider.DecreaseLarge"
+                                  Style="{StaticResource UiSliderButtonStyle}"
+                                  />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Thumb x:Name="Thumb" Style="{StaticResource UiSliderThumbStyle}" />
+                    <Thumb x:Name="Thumb"
+                           Style="{StaticResource UiSliderThumbStyle}"
+                           />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Command="Slider.IncreaseLarge" Style="{StaticResource UiSliderButtonStyle}" />
+                    <RepeatButton Command="Slider.IncreaseLarge"
+                                  Style="{StaticResource UiSliderButtonStyle}"
+                                  />
                 </Track.IncreaseRepeatButton>
             </Track>
-            <TickBar
-                x:Name="BottomTick"
-                Grid.Column="2"
-                Width="6"
-                Fill="{DynamicResource SliderTickBarFill}"
-                Placement="Right"
-                SnapsToDevicePixels="True"
-                Visibility="Collapsed" />
+            <TickBar x:Name="BottomTick"
+                     Grid.Column="2"
+                     Width="6"
+                     Fill="{DynamicResource SliderTickBarFill}"
+                     Placement="Right"
+                     SnapsToDevicePixels="True"
+                     Visibility="Collapsed"
+                     />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="TickPlacement" Value="TopLeft">
-                <Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
+                <Setter TargetName="TopTick" Property="Visibility" Value="Visible"/>
             </Trigger>
             <Trigger Property="TickPlacement" Value="BottomRight">
-                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
+                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible"/>
             </Trigger>
             <Trigger Property="TickPlacement" Value="Both">
-                <Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
-                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
+                <Setter TargetName="TopTick" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="TrackBackground" Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
-                <Setter TargetName="Thumb" Property="Foreground" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+                <Setter TargetName="TrackBackground" Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}"/>
+                <Setter TargetName="Thumb" Property="Foreground" Value="{DynamicResource SliderThumbBackgroundPointerOver}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <Style TargetType="{x:Type Slider}">
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Horizontal">
-                <Setter Property="MinWidth" Value="104" />
-                <Setter Property="MinHeight" Value="21" />
-                <Setter Property="Template" Value="{StaticResource UiHorizontalSlider}" />
+                <Setter Property="MinWidth" Value="104"/>
+                <Setter Property="MinHeight" Value="21"/>
+                <Setter Property="Template" Value="{StaticResource UiHorizontalSlider}"/>
             </Trigger>
             <Trigger Property="Orientation" Value="Vertical">
-                <Setter Property="MinWidth" Value="21" />
-                <Setter Property="MinHeight" Value="104" />
-                <Setter Property="Template" Value="{StaticResource UiVerticalSlider}" />
+                <Setter Property="MinWidth" Value="21"/>
+                <Setter Property="MinHeight" Value="104"/>
+                <Setter Property="Template" Value="{StaticResource UiVerticalSlider}"/>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/Slider/SliderThumbPositionConverter.cs b/src/Wpf.Ui/Controls/Slider/SliderThumbPositionConverter.cs
new file mode 100644
index 000000000..40c1d441f
--- /dev/null
+++ b/src/Wpf.Ui/Controls/Slider/SliderThumbPositionConverter.cs
@@ -0,0 +1,22 @@
+using System.Windows.Data;
+
+// ReSharper disable once CheckNamespace
+namespace Wpf.Ui.Controls;
+
+public class SliderThumbPositionConverter : IMultiValueConverter
+{
+    public object Convert(object[]? values, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (values is [double trackActualDimension, double trackValue, double trackMinimum, double trackMaximum])
+        {
+            return trackActualDimension * (trackValue - trackMinimum) / (trackMaximum - trackMinimum);
+        }
+
+        return Binding.DoNothing;
+    }
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Wpf.Ui/Markup/FontIconExtension.cs b/src/Wpf.Ui/Markup/FontIconExtension.cs
index 448ea33a6..6be6cc6e4 100644
--- a/src/Wpf.Ui/Markup/FontIconExtension.cs
+++ b/src/Wpf.Ui/Markup/FontIconExtension.cs
@@ -3,6 +3,7 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
+using System.Windows.Controls;
 using System.Windows.Markup;
 using Wpf.Ui.Controls;
 
@@ -39,33 +40,86 @@ public FontIconExtension(string glyph)
         Glyph = glyph;
     }
 
+    public FontIconExtension(string glyph, double fontSize)
+        : this(glyph)
+    {
+        FontSize = fontSize;
+    }
+
+    public FontIconExtension(string glyph, FontFamily fontFamily, double fontSize)
+        : this(glyph, fontSize)
+    {
+        FontFamily = fontFamily;
+    }
+
     [ConstructorArgument("glyph")]
-    public string? Glyph { get; set; }
+    public required string Glyph { get; set; }
 
     [ConstructorArgument("fontFamily")]
     public FontFamily FontFamily { get; set; } = new("FluentSystemIcons");
 
-    public double FontSize { get; set; }
+    [ConstructorArgument("fontSize")]
+    public double? FontSize { get; set; }
 
     public override object ProvideValue(IServiceProvider serviceProvider)
     {
-        if (
-            serviceProvider.GetService(typeof(IProvideValueTarget)) is IProvideValueTarget
+        if (serviceProvider.GetService(typeof(IProvideValueTarget)) is not IProvideValueTarget provideValueTarget)
+        {
+            return new FontIcon
             {
-                TargetObject: Setter
-            }
-        )
+                FontFamily = FontFamily,
+                Glyph = Glyph,
+                FontSize = FontSize ?? SystemFonts.MessageFontSize
+            };
+        }
+
+        if (provideValueTarget.TargetObject is Setter)
         {
             return this;
         }
 
-        FontIcon fontIcon = new() { Glyph = Glyph, FontFamily = FontFamily };
+        FontIcon fontIcon = new()
+        {
+            FontFamily = FontFamily,
+            Glyph = Glyph,
+        };
+
+        if (FontSize.HasValue)
+        {
+            fontIcon.FontSize = FontSize.Value;
+        }
 
-        if (FontSize > 0)
+        if (provideValueTarget.TargetObject is not FrameworkElement targetElement)
         {
-            fontIcon.FontSize = FontSize;
+            return fontIcon;
         }
 
+        targetElement.Loaded += (_, _) =>
+        {
+            UpdateFontSize(fontIcon, targetElement);
+        };
+
+        targetElement.LayoutUpdated += (_, _) =>
+        {
+            UpdateFontSize(fontIcon, targetElement);
+        };
+
         return fontIcon;
     }
-}
+
+    private void UpdateFontSize(FontIcon fontIcon, FrameworkElement targetElement)
+    {
+        if (FontSize.HasValue)
+        {
+            fontIcon.SetCurrentValue(FontIcon.FontSizeProperty, FontSize.Value);
+        }
+        else if (targetElement is Control control)
+        {
+            fontIcon.SetCurrentValue(FontIcon.FontSizeProperty, control.FontSize);
+        }
+        else
+        {
+            fontIcon.SetCurrentValue(FontIcon.FontSizeProperty, SystemFonts.MessageFontSize);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Wpf.Ui/Markup/SymbolIconExtension.cs b/src/Wpf.Ui/Markup/SymbolIconExtension.cs
index 754706976..c2cf86c7a 100644
--- a/src/Wpf.Ui/Markup/SymbolIconExtension.cs
+++ b/src/Wpf.Ui/Markup/SymbolIconExtension.cs
@@ -3,6 +3,7 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
+using System.Windows.Controls;
 using System.Windows.Markup;
 using Wpf.Ui.Controls;
 
@@ -50,33 +51,66 @@ public SymbolIconExtension(SymbolRegular symbol, bool filled)
         Filled = filled;
     }
 
+    public SymbolIconExtension(SymbolRegular symbol, bool filled, double fontSize)
+        : this(symbol, filled)
+    {
+        FontSize = fontSize;
+    }
+
     [ConstructorArgument("symbol")]
     public SymbolRegular Symbol { get; set; }
 
     [ConstructorArgument("filled")]
     public bool Filled { get; set; }
 
+    [ConstructorArgument("fontSize")]
     public double FontSize { get; set; }
 
     public override object ProvideValue(IServiceProvider serviceProvider)
     {
-        if (
-            serviceProvider.GetService(typeof(IProvideValueTarget)) is IProvideValueTarget
-            {
-                TargetObject: Setter
-            }
-        )
+        if (serviceProvider.GetService(typeof(IProvideValueTarget)) is not IProvideValueTarget provideValueTarget)
+        {
+            return new SymbolIcon { Symbol = Symbol, Filled = Filled, FontSize = FontSize > 0 ? FontSize : SystemFonts.MessageFontSize };
+        }
+
+        if (provideValueTarget.TargetObject is Setter)
         {
             return this;
         }
 
-        SymbolIcon symbolIcon = new() { Symbol = Symbol, Filled = Filled };
+        SymbolIcon symbolIcon = new ()
+        {
+            Symbol = Symbol,
+            Filled = Filled
+        };
 
-        if (FontSize > 0)
+        if (provideValueTarget.TargetObject is not FrameworkElement targetElement)
         {
-            symbolIcon.FontSize = FontSize;
+            return symbolIcon;
         }
 
+        targetElement.Loaded += (_, _) =>
+        {
+            UpdateFontSize(symbolIcon, targetElement);
+        };
+
+        targetElement.LayoutUpdated += (_, _) =>
+        {
+            UpdateFontSize(symbolIcon, targetElement);
+        };
+
         return symbolIcon;
     }
-}
+
+    private void UpdateFontSize(SymbolIcon symbolIcon, FrameworkElement targetElement)
+    {
+        if (FontSize > 0)
+        {
+            symbolIcon.SetCurrentValue(FontIcon.FontSizeProperty, FontSize);
+        }
+        else if (targetElement is Control control)
+        {
+            symbolIcon.SetCurrentValue(FontIcon.FontSizeProperty, control.FontSize);
+        }
+    }
+}
\ No newline at end of file

From ee5b3c355ce333242d5fdfe020957635fd3ec062 Mon Sep 17 00:00:00 2001
From: mOlDaViA <crayzyone@gmail.com>
Date: Mon, 24 Jun 2024 07:03:51 +0200
Subject: [PATCH 3/4] Rewrite of the TitleBar class:

1. Added AdditionalControls property:
You can now add additional buttons with the same default size or add customizied controls.
Button default style example:
```csharp
<ui:Button Width="44"
           Height="30"
           BorderThickness="0"
           Background="Transparent"
           Icon="{ui:SymbolIcon DarkTheme24,
                                False,
                                15}"
           />```

2. Header remains the same.

3. Window is now resizable if you use a TitleBar:
You can now (finally!) resize the window if you use the TitleBar! This was the most reason why i switched here from messages to events. Messages are basically not necsassary for the titlebar.

4. ActionsOverride:
You can now override every default button (Help, Minimize, Maximize and Close) contained in the TitleBar.
Before you could create a RoutedEvent for the close event and performe actions in there but you could never cancel the close method as it was a seperated event inside the TitleBar called after the override action.
Now you can!

4. Added boolean UseTrayMenu:
If UseTrayMenu on close click the application now hides instead the window of closing it. Add your tray menu and your boolean and you are good to go.

5. DragMove from maximized window is now smoother.
---
 .../Controls/AccessText/AccessText.xaml       |   28 +-
 src/Wpf.Ui/Controls/Anchor/Anchor.xaml        |   22 +-
 .../AutoSuggestBox/AutoSuggestBox.xaml        |  212 +--
 src/Wpf.Ui/Controls/Badge/Badge.xaml          |   68 +-
 .../Controls/BreadcrumbBar/BreadcrumbBar.xaml |  128 +-
 src/Wpf.Ui/Controls/Calendar/Calendar.xaml    |  640 ++++----
 .../CalendarDatePicker.xaml                   |   24 +-
 src/Wpf.Ui/Controls/Card/Card.xaml            |   98 +-
 .../Controls/CardAction/CardAction.xaml       |  166 +-
 src/Wpf.Ui/Controls/CardColor/CardColor.xaml  |   66 +-
 .../Controls/CardControl/CardControl.xaml     |  166 +-
 .../Controls/CardExpander/CardExpander.xaml   |  314 ++--
 src/Wpf.Ui/Controls/CheckBox/CheckBox.xaml    |  180 +-
 .../Controls/ColorPicker/ColorPicker.xaml     |   12 +-
 src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml    |  504 +++---
 .../Controls/ContentDialog/ContentDialog.xaml |  298 ++--
 .../Controls/ContextMenu/ContextMenu.xaml     |   78 +-
 .../ContextMenu/ContextMenuLoader.xaml        |    8 +-
 src/Wpf.Ui/Controls/DataGrid/DataGrid.xaml    |  843 +++++-----
 .../Controls/DatePicker/DatePicker.xaml       |  246 +--
 .../DropDownButton/DropDownButton.xaml        |  142 +-
 .../DynamicScrollBar/DynamicScrollBar.xaml    |  562 ++++---
 .../DynamicScrollViewer.xaml                  |   88 +-
 src/Wpf.Ui/Controls/Expander/Expander.xaml    |  278 ++--
 .../Controls/FluentWindow/FluentWindow.xaml   |   60 +-
 src/Wpf.Ui/Controls/Flyout/Flyout.xaml        |  104 +-
 src/Wpf.Ui/Controls/Frame/Frame.xaml          |   16 +-
 .../GridView/GridViewColumnHeader.xaml        |  116 +-
 .../HyperlinkButton/HyperlinkButton.xaml      |  136 +-
 src/Wpf.Ui/Controls/Image/Image.xaml          |   54 +-
 src/Wpf.Ui/Controls/InfoBadge/InfoBadge.xaml  |  188 ++-
 src/Wpf.Ui/Controls/InfoBar/InfoBar.xaml      |  160 +-
 .../Controls/ItemsControl/ItemsControl.xaml   |    4 +-
 src/Wpf.Ui/Controls/Label/Label.xaml          |   12 +-
 src/Wpf.Ui/Controls/ListBox/ListBox.xaml      |   58 +-
 src/Wpf.Ui/Controls/ListBox/ListBoxItem.xaml  |   54 +-
 src/Wpf.Ui/Controls/ListView/ListView.xaml    |  240 +--
 .../Controls/ListView/ListViewItem.xaml       |  152 +-
 .../Controls/LoadingScreen/LoadingScreen.xaml |   40 +-
 src/Wpf.Ui/Controls/Menu/Menu.xaml            |   44 +-
 src/Wpf.Ui/Controls/Menu/MenuItem.xaml        | 1058 ++++++------
 src/Wpf.Ui/Controls/Menu/MenuLoader.xaml      |   10 +-
 .../Controls/MessageBox/MessageBox.xaml       |  210 +--
 .../NavigationView/NavigationLeftFluent.xaml  |  210 +--
 .../NavigationView/NavigationView.xaml        |   80 +-
 .../NavigationViewBasePaneButtonStyle.xaml    |  128 +-
 .../NavigationView/NavigationViewBottom.xaml  |  256 +--
 .../NavigationViewBreadcrumbItem.xaml         |   16 +-
 .../NavigationView/NavigationViewCompact.xaml |  618 +++----
 .../NavigationViewConstants.xaml              |   16 +-
 .../NavigationViewContentPresenter.xaml       |   54 +-
 .../NavigationViewItemDefaultStyle.xaml       |   40 +-
 .../NavigationViewItemHeader.xaml             |   66 +-
 .../NavigationViewItemSeparator.xaml          |   32 +-
 .../NavigationViewLeftMinimalCompact.xaml     |  276 ++--
 .../NavigationView/NavigationViewTop.xaml     |  476 +++---
 src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml  |  390 ++---
 src/Wpf.Ui/Controls/Page/Page.xaml            |   32 +-
 .../Controls/PasswordBox/PasswordBox.xaml     |  448 ++---
 .../Controls/ProgressBar/ProgressBar.xaml     |  116 +-
 .../Controls/ProgressRing/ProgressRing.xaml   |  114 +-
 .../Controls/RadioButton/RadioButton.xaml     |  220 +--
 .../Controls/RatingControl/RatingControl.xaml |  132 +-
 .../Controls/RichTextBox/RichTextBox.xaml     |  108 +-
 src/Wpf.Ui/Controls/ScrollBar/ScrollBar.xaml  |  516 +++---
 .../Controls/ScrollViewer/ScrollViewer.xaml   |   84 +-
 src/Wpf.Ui/Controls/Separator/Separator.xaml  |   30 +-
 src/Wpf.Ui/Controls/Snackbar/Snackbar.xaml    |  278 ++--
 .../Controls/SplitButton/SplitButton.xaml     |  238 +--
 src/Wpf.Ui/Controls/StatusBar/StatusBar.xaml  |   44 +-
 .../Controls/TabControl/TabControl.xaml       |  152 +-
 src/Wpf.Ui/Controls/TextBlock/TextBlock.xaml  |   18 +-
 src/Wpf.Ui/Controls/TextBox/TextBox.xaml      |  508 +++---
 src/Wpf.Ui/Controls/ThumbRate/ThumbRate.xaml  |   82 +-
 .../Controls/TimePicker/TimePicker.xaml       |  156 +-
 src/Wpf.Ui/Controls/TitleBar/TitleBar.cs      |  748 ++++-----
 src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml    |  395 ++---
 .../Controls/TitleBar/TitleBarButton.cs       |  237 ---
 .../Controls/TitleBar/TitleBarButtonType.cs   |   43 -
 .../Controls/ToggleButton/ToggleButton.xaml   |  144 +-
 .../Controls/ToggleSwitch/ToggleSwitch.xaml   |  390 ++---
 src/Wpf.Ui/Controls/ToolBar/ToolBar.xaml      |  318 ++--
 src/Wpf.Ui/Controls/ToolTip/ToolTip.xaml      |   78 +-
 src/Wpf.Ui/Controls/TreeGrid/TreeGrid.xaml    |   98 +-
 src/Wpf.Ui/Controls/TreeView/TreeView.xaml    |   70 +-
 .../Controls/TreeView/TreeViewItem.xaml       |  358 ++--
 .../VirtualizingGridView.xaml                 |   62 +-
 .../VirtualizingItemsControl.xaml             |   50 +-
 .../VirtualizingWrapPanel.xaml                |   20 +-
 src/Wpf.Ui/Controls/Window/Window.xaml        |   72 +-
 src/Wpf.Ui/Resources/Accent.xaml              |   64 +-
 src/Wpf.Ui/Resources/DefaultContextMenu.xaml  |   10 +-
 .../Resources/DefaultFocusVisualStyle.xaml    |   20 +-
 .../DefaultTextBoxScrollViewerStyle.xaml      |   29 +-
 src/Wpf.Ui/Resources/Fonts.xaml               |    4 +-
 src/Wpf.Ui/Resources/Palette.xaml             |   84 +-
 src/Wpf.Ui/Resources/StaticColors.xaml        |   60 +-
 src/Wpf.Ui/Resources/Theme/Dark.xaml          | 1450 ++++++++++++-----
 src/Wpf.Ui/Resources/Typography.xaml          |  108 +-
 src/Wpf.Ui/Resources/Variables.xaml           |    8 +-
 src/Wpf.Ui/Resources/Wpf.Ui.xaml              |  182 +--
 101 files changed, 10051 insertions(+), 8872 deletions(-)
 delete mode 100644 src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
 delete mode 100644 src/Wpf.Ui/Controls/TitleBar/TitleBarButtonType.cs

diff --git a/src/Wpf.Ui/Controls/AccessText/AccessText.xaml b/src/Wpf.Ui/Controls/AccessText/AccessText.xaml
index 3e8dde99c..b39cfa8ae 100644
--- a/src/Wpf.Ui/Controls/AccessText/AccessText.xaml
+++ b/src/Wpf.Ui/Controls/AccessText/AccessText.xaml
@@ -5,20 +5,24 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
-    <Style x:Key="DefaultAccessTextStyle" TargetType="{x:Type AccessText}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultAccessTextStyle"
+           TargetType="{x:Type AccessText}"
+           >
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
     </Style>
 
-    <Style
-        x:Key="{x:Type AccessText}"
-        BasedOn="{StaticResource DefaultAccessTextStyle}"
-        TargetType="{x:Type AccessText}" />
+    <Style x:Key="{x:Type AccessText}"
+           BasedOn="{StaticResource DefaultAccessTextStyle}"
+           TargetType="{x:Type AccessText}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/Anchor/Anchor.xaml b/src/Wpf.Ui/Controls/Anchor/Anchor.xaml
index 4bc2214e1..d4fb30f49 100644
--- a/src/Wpf.Ui/Controls/Anchor/Anchor.xaml
+++ b/src/Wpf.Ui/Controls/Anchor/Anchor.xaml
@@ -8,20 +8,22 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Button/Button.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Button/Button.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Style
-        x:Key="DefaultUiAnchorStyle"
-        BasedOn="{StaticResource DefaultUiButtonStyle}"
-        TargetType="{x:Type controls:Anchor}" />
+    <Style x:Key="DefaultUiAnchorStyle"
+           BasedOn="{StaticResource DefaultUiButtonStyle}"
+           TargetType="{x:Type controls:Anchor}"
+           />
 
-    <Style BasedOn="{StaticResource DefaultUiAnchorStyle}" TargetType="{x:Type controls:Anchor}" />
+    <Style BasedOn="{StaticResource DefaultUiAnchorStyle}"
+           TargetType="{x:Type controls:Anchor}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
index 5465b4a70..00ded52dd 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
@@ -1,8 +1,8 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"
+                    >
 
     <Thickness x:Key="AutoSuggestBoxBorderThemeThickness">1,1,1,0</Thickness>
     <Thickness x:Key="AutoSuggestBoxAccentBorderThemeThickness">0,0,0,1</Thickness>
@@ -13,74 +13,76 @@
     <system:Double x:Key="AutoSuggestBoxClearButtonHeight">24</system:Double>
     <system:Double x:Key="AutoSuggestBoxClearButtonIconSize">14</system:Double>
 
-    <Style x:Key="DefaultAutoSuggestBoxItemContainerStyle" TargetType="{x:Type controls:ListViewItem}">
-        <Setter Property="Foreground" Value="{DynamicResource ListViewItemForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="Margin" Value="0,0,0,2" />
-        <Setter Property="Padding" Value="4" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultAutoSuggestBoxItemContainerStyle"
+           TargetType="{x:Type controls:ListViewItem}"
+           >
+        <Setter Property="Foreground" Value="{DynamicResource ListViewItemForeground}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="Margin" Value="0,0,0,2"/>
+        <Setter Property="Padding" Value="4"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <Border
-                        x:Name="ContentBorder"
-                        Margin="4,0,4,0"
-                        Padding="6,10"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        CornerRadius="6">
+                    <Border x:Name="ContentBorder"
+                            Margin="4,0,4,0"
+                            Padding="6,10"
+                            Background="Transparent"
+                            BorderThickness="0"
+                            CornerRadius="6"
+                            >
                         <Grid>
-                            <ContentPresenter Margin="12,0,0,0" />
-                            <Rectangle
-                                x:Name="ActiveRectangle"
-                                Width="3"
-                                Height="18"
-                                Margin="0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Fill="{DynamicResource ListViewItemPillFillBrush}"
-                                RadiusX="2"
-                                RadiusY="2"
-                                Visibility="Collapsed" />
+                            <ContentPresenter Margin="12,0,0,0"/>
+                            <Rectangle x:Name="ActiveRectangle"
+                                       Width="3"
+                                       Height="18"
+                                       Margin="0"
+                                       HorizontalAlignment="Left"
+                                       VerticalAlignment="Center"
+                                       Fill="{DynamicResource ListViewItemPillFillBrush}"
+                                       RadiusX="2"
+                                       RadiusY="2"
+                                       Visibility="Collapsed"
+                                       />
                         </Grid>
 
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
-                            <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}"/>
+                            <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible"/>
                         </Trigger>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsSelected" Value="False" />
-                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsSelected" Value="False"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
+                                <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}"/>
                             </MultiTrigger.Setters>
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ContentBorder"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="0.0"
-                                            To="1.0"
-                                            Duration="00:00:00.167" />
+                                        <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                         Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
+                                                         From="0.0"
+                                                         To="1.0"
+                                                         Duration="00:00:00.167"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </MultiTrigger.EnterActions>
                             <MultiTrigger.ExitActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ContentBorder"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="1.0"
-                                            To="0.0"
-                                            Duration="00:00:00.167" />
+                                        <DoubleAnimation Storyboard.TargetName="ContentBorder"
+                                                         Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
+                                                         From="1.0"
+                                                         To="0.0"
+                                                         Duration="00:00:00.167"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </MultiTrigger.ExitActions>
@@ -91,24 +93,26 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultUiAutoSuggestBoxStyle" TargetType="{x:Type controls:AutoSuggestBox}">
-        <Setter Property="MaxSuggestionListHeight" Value="240" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="BorderThickness" Value="{StaticResource AutoSuggestBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="ItemContainerStyle" Value="{StaticResource DefaultAutoSuggestBoxItemContainerStyle}" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultUiAutoSuggestBoxStyle"
+           TargetType="{x:Type controls:AutoSuggestBox}"
+           >
+        <Setter Property="MaxSuggestionListHeight" Value="240"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource AutoSuggestBoxBorderThemeThickness}"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource DefaultAutoSuggestBoxItemContainerStyle}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Icon">
             <Setter.Value>
                 <controls:IconSourceElement>
                     <controls:IconSourceElement.IconSource>
-                        <controls:SymbolIconSource Symbol="Search24" />
+                        <controls:SymbolIconSource Symbol="Search24"/>
                     </controls:IconSourceElement.IconSource>
                 </controls:IconSourceElement>
             </Setter.Value>
@@ -117,49 +121,49 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:AutoSuggestBox}">
                     <Grid>
-                        <controls:TextBox
-                            x:Name="PART_TextBox"
-                            Grid.Row="0"
-                            Icon="{TemplateBinding Icon}"
-                            IconPlacement="Right"
-                            PlaceholderText="{TemplateBinding PlaceholderText}"
-                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}" />
+                        <controls:TextBox x:Name="PART_TextBox"
+                                          Grid.Row="0"
+                                          Icon="{TemplateBinding Icon}"
+                                          IconPlacement="Right"
+                                          PlaceholderText="{TemplateBinding PlaceholderText}"
+                                          Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}"
+                                          />
 
-                        <Popup
-                            x:Name="PART_SuggestionsPopup"
-                            MinWidth="{TemplateBinding ActualWidth}"
-                            Margin="0"
-                            HorizontalAlignment="Stretch"
-                            AllowsTransparency="True"
-                            Focusable="False"
-                            IsOpen="{TemplateBinding IsSuggestionListOpen}"
-                            Placement="Bottom"
-                            PopupAnimation="Slide">
-                            <Border
-                                Margin="0"
-                                Padding="0,6,0,6"
-                                HorizontalAlignment="Stretch"
-                                Background="{DynamicResource FlyoutBackground}"
-                                BorderBrush="{DynamicResource FlyoutBorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="8"
-                                SnapsToDevicePixels="True">
-                                <controls:ListView
-                                    x:Name="PART_SuggestionsList"
-                                    MaxHeight="{TemplateBinding MaxSuggestionListHeight}"
-                                    DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
-                                    ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
-                                    ItemTemplate="{TemplateBinding ItemTemplate}"
-                                    ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                    ItemsSource="{TemplateBinding ItemsSource}"
-                                    KeyboardNavigation.DirectionalNavigation="Cycle"
-                                    SelectionMode="Single">
+                        <Popup x:Name="PART_SuggestionsPopup"
+                               MinWidth="{TemplateBinding ActualWidth}"
+                               Margin="0"
+                               HorizontalAlignment="Stretch"
+                               AllowsTransparency="True"
+                               Focusable="False"
+                               IsOpen="{TemplateBinding IsSuggestionListOpen}"
+                               Placement="Bottom"
+                               PopupAnimation="Slide"
+                               >
+                            <Border Margin="0"
+                                    Padding="0,6,0,6"
+                                    HorizontalAlignment="Stretch"
+                                    Background="{DynamicResource FlyoutBackground}"
+                                    BorderBrush="{DynamicResource FlyoutBorderBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="8"
+                                    SnapsToDevicePixels="True"
+                                    >
+                                <controls:ListView x:Name="PART_SuggestionsList"
+                                                   MaxHeight="{TemplateBinding MaxSuggestionListHeight}"
+                                                   DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
+                                                   ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
+                                                   ItemTemplate="{TemplateBinding ItemTemplate}"
+                                                   ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                                   ItemsSource="{TemplateBinding ItemsSource}"
+                                                   KeyboardNavigation.DirectionalNavigation="Cycle"
+                                                   SelectionMode="Single"
+                                                   >
                                     <controls:ListView.ItemsPanel>
                                         <ItemsPanelTemplate>
-                                            <VirtualizingStackPanel
-                                                IsItemsHost="True"
-                                                IsVirtualizing="True"
-                                                VirtualizationMode="Recycling" />
+                                            <VirtualizingStackPanel IsItemsHost="True"
+                                                                    IsVirtualizing="True"
+                                                                    VirtualizationMode="Recycling"
+                                                                    />
                                         </ItemsPanelTemplate>
                                     </controls:ListView.ItemsPanel>
                                 </controls:ListView>
@@ -171,6 +175,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiAutoSuggestBoxStyle}" TargetType="{x:Type controls:AutoSuggestBox}" />
+    <Style BasedOn="{StaticResource DefaultUiAutoSuggestBoxStyle}"
+           TargetType="{x:Type controls:AutoSuggestBox}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/Badge/Badge.xaml b/src/Wpf.Ui/Controls/Badge/Badge.xaml
index 8d38acca1..26d7f98d7 100644
--- a/src/Wpf.Ui/Controls/Badge/Badge.xaml
+++ b/src/Wpf.Ui/Controls/Badge/Badge.xaml
@@ -5,65 +5,65 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Style TargetType="{x:Type controls:Badge}">
-        <Setter Property="Foreground" Value="{DynamicResource BadgeForeground}" />
-        <Setter Property="Background" Value="{DynamicResource BadgeBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource BadgeForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource BadgeBackground}"/>
         <!--<Setter Property="BorderBrush" Value="{DynamicResource SystemAccentBrush}" />-->
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="Padding" Value="4" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Padding" Value="4"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:Badge}">
-                    <Border
-                        x:Name="Border"
-                        Padding="{TemplateBinding Padding}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="1"
-                        CornerRadius="4">
-                        <ContentPresenter />
+                    <Border x:Name="Border"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="4"
+                            >
+                        <ContentPresenter/>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Appearance" Value="Primary">
-                            <Setter Property="Foreground" Value="{DynamicResource BadgeForeground}" />
+                            <Setter Property="Foreground" Value="{DynamicResource BadgeForeground}"/>
                         </Trigger>
                         <Trigger Property="Appearance" Value="Transparent">
-                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-                            <Setter TargetName="Border" Property="Background" Value="Transparent" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+                            <Setter TargetName="Border" Property="Background" Value="Transparent"/>
                         </Trigger>
                         <Trigger Property="Appearance" Value="Secondary">
-                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}"/>
                         </Trigger>
                         <Trigger Property="Appearance" Value="Info">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource PaletteLightBlueBrush}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource PaletteLightBlueBrush}"/>
                         </Trigger>
                         <Trigger Property="Appearance" Value="Caution">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource PaletteOrangeBrush}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource PaletteOrangeBrush}"/>
                         </Trigger>
                         <Trigger Property="Appearance" Value="Danger">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource PaletteRedBrush}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource PaletteRedBrush}"/>
                         </Trigger>
                         <Trigger Property="Appearance" Value="Success">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource PaletteGreenBrush}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource PaletteGreenBrush}"/>
                         </Trigger>
                         <Trigger Property="Appearance" Value="Dark">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource ControlStrongFillColorDarkBrush}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextFillColorLightPrimaryBrush}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource ControlStrongFillColorDarkBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TextFillColorLightPrimaryBrush}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
                         </Trigger>
                         <Trigger Property="Appearance" Value="Light">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource ControlStrongFillColorLightBrush}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextFillColorDarkPrimaryBrush}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource ControlStrongFillColorLightBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TextFillColorDarkPrimaryBrush}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/BreadcrumbBar/BreadcrumbBar.xaml b/src/Wpf.Ui/Controls/BreadcrumbBar/BreadcrumbBar.xaml
index 544f3f8f0..2055734c4 100644
--- a/src/Wpf.Ui/Controls/BreadcrumbBar/BreadcrumbBar.xaml
+++ b/src/Wpf.Ui/Controls/BreadcrumbBar/BreadcrumbBar.xaml
@@ -5,53 +5,57 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style x:Key="DefaultUiBreadcrumbButtonStyle" TargetType="{x:Type ButtonBase}">
-        <Setter Property="Foreground" Value="{DynamicResource BreadcrumbBarNormalForegroundBrush}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultUiBreadcrumbButtonStyle"
+           TargetType="{x:Type ButtonBase}"
+           >
+        <Setter Property="Foreground" Value="{DynamicResource BreadcrumbBarNormalForegroundBrush}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
-                    <ContentPresenter
-                        x:Name="Presenter"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+                    <ContentPresenter x:Name="Presenter"
+                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                      />
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Presenter" Property="TextElement.Foreground" Value="{DynamicResource BreadcrumbBarHoverForegroundBrush}" />
+                            <Setter TargetName="Presenter" Property="TextElement.Foreground" Value="{DynamicResource BreadcrumbBarHoverForegroundBrush}"/>
                         </Trigger>
-                        <Trigger Property="IsEnabled" Value="False" />
+                        <Trigger Property="IsEnabled" Value="False"/>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultUiBreadcrumbBarItemStyle" TargetType="{x:Type controls:BreadcrumbBarItem}">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="FontWeight" Value="DemiBold" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="IconMargin" Value="10, 0, 10, 0" />
-        <Setter Property="Focusable" Value="False" />
+    <Style x:Key="DefaultUiBreadcrumbBarItemStyle"
+           TargetType="{x:Type controls:BreadcrumbBarItem}"
+           >
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="FontWeight" Value="DemiBold"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="IconMargin" Value="10, 0, 10, 0"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Icon">
             <Setter.Value>
                 <controls:IconSourceElement>
                     <controls:IconSourceElement.IconSource>
-                        <controls:SymbolIconSource
-                            FontSize="18.0"
-                            FontWeight="DemiBold"
-                            Symbol="ChevronRight24" />
+                        <controls:SymbolIconSource FontSize="18.0"
+                                                   FontWeight="DemiBold"
+                                                   Symbol="ChevronRight24"
+                                                   />
                     </controls:IconSourceElement.IconSource>
                 </controls:IconSourceElement>
             </Setter.Value>
@@ -61,37 +65,37 @@
                 <ControlTemplate TargetType="{x:Type controls:BreadcrumbBarItem}">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
 
-                        <Button
-                            x:Name="Button"
-                            Grid.Column="0"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Command="{Binding Path=TemplateButtonCommand, Mode=OneTime, RelativeSource={RelativeSource AncestorType={x:Type controls:BreadcrumbBar}}}"
-                            CommandParameter="{TemplateBinding Content}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{Binding Path=ItemTemplate, Mode=OneTime, RelativeSource={RelativeSource AncestorType={x:Type controls:BreadcrumbBar}}}"
-                            ContentTemplateSelector="{Binding Path=ItemTemplateSelector, Mode=OneTime, RelativeSource={RelativeSource AncestorType={x:Type controls:BreadcrumbBar}}}"
-                            FontSize="{TemplateBinding FontSize}"
-                            FontWeight="{TemplateBinding FontWeight}"
-                            Style="{StaticResource DefaultUiBreadcrumbButtonStyle}" />
+                        <Button x:Name="Button"
+                                Grid.Column="0"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Command="{Binding Path=TemplateButtonCommand, Mode=OneTime, RelativeSource={RelativeSource AncestorType={x:Type controls:BreadcrumbBar}}}"
+                                CommandParameter="{TemplateBinding Content}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{Binding Path=ItemTemplate, Mode=OneTime, RelativeSource={RelativeSource AncestorType={x:Type controls:BreadcrumbBar}}}"
+                                ContentTemplateSelector="{Binding Path=ItemTemplateSelector, Mode=OneTime, RelativeSource={RelativeSource AncestorType={x:Type controls:BreadcrumbBar}}}"
+                                FontSize="{TemplateBinding FontSize}"
+                                FontWeight="{TemplateBinding FontWeight}"
+                                Style="{StaticResource DefaultUiBreadcrumbButtonStyle}"
+                                />
 
-                        <ContentControl
-                            x:Name="Icon"
-                            Grid.Column="1"
-                            Margin="{TemplateBinding IconMargin}"
-                            Content="{TemplateBinding Icon}"
-                            Focusable="False" />
+                        <ContentControl x:Name="Icon"
+                                        Grid.Column="1"
+                                        Margin="{TemplateBinding IconMargin}"
+                                        Content="{TemplateBinding Icon}"
+                                        Focusable="False"
+                                        />
                     </Grid>
 
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsLast" Value="True">
-                            <Setter TargetName="Button" Property="Foreground" Value="{DynamicResource BreadcrumbBarCurrentNormalForegroundBrush}" />
-                            <Setter TargetName="Button" Property="IsEnabled" Value="False" />
-                            <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="Button" Property="Foreground" Value="{DynamicResource BreadcrumbBarCurrentNormalForegroundBrush}"/>
+                            <Setter TargetName="Button" Property="IsEnabled" Value="False"/>
+                            <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -99,17 +103,25 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultUiBreadcrumbBarStyle" TargetType="{x:Type controls:BreadcrumbBar}">
+    <Style x:Key="DefaultUiBreadcrumbBarStyle"
+           TargetType="{x:Type controls:BreadcrumbBar}"
+           >
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <StackPanel IsItemsHost="True" Orientation="Horizontal" />
+                    <StackPanel IsItemsHost="True"
+                                Orientation="Horizontal"
+                                />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiBreadcrumbBarItemStyle}" TargetType="{x:Type controls:BreadcrumbBarItem}" />
-    <Style BasedOn="{StaticResource DefaultUiBreadcrumbBarStyle}" TargetType="{x:Type controls:BreadcrumbBar}" />
+    <Style BasedOn="{StaticResource DefaultUiBreadcrumbBarItemStyle}"
+           TargetType="{x:Type controls:BreadcrumbBarItem}"
+           />
+    <Style BasedOn="{StaticResource DefaultUiBreadcrumbBarStyle}"
+           TargetType="{x:Type controls:BreadcrumbBar}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/Calendar/Calendar.xaml b/src/Wpf.Ui/Controls/Calendar/Calendar.xaml
index b4948930d..f25969b44 100644
--- a/src/Wpf.Ui/Controls/Calendar/Calendar.xaml
+++ b/src/Wpf.Ui/Controls/Calendar/Calendar.xaml
@@ -5,10 +5,10 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <!--
         TODO:
@@ -18,119 +18,121 @@
     -->
 
     <!--  HINT: Day button style  -->
-    <Style x:Key="DefaultCalendarDayButtonStyle" TargetType="CalendarDayButton">
-        <Setter Property="MinWidth" Value="30" />
-        <Setter Property="MinHeight" Value="30" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Style x:Key="DefaultCalendarDayButtonStyle"
+           TargetType="CalendarDayButton"
+           >
+        <Setter Property="MinWidth" Value="30"/>
+        <Setter Property="MinHeight" Value="30"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="CalendarDayButton">
                     <Grid>
-                        <Rectangle
-                            x:Name="TodayBackground"
-                            Fill="{DynamicResource CalendarViewTodayBackground}"
-                            Opacity="0"
-                            RadiusX="99"
-                            RadiusY="99" />
-                        <Rectangle
-                            x:Name="SelectedBackground"
-                            Opacity="0"
-                            RadiusX="99"
-                            RadiusY="99"
-                            Stroke="{DynamicResource CalendarViewSelectedBorderBrush}"
-                            StrokeThickness="1" />
-                        <Border
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}" />
-                        <Rectangle
-                            x:Name="HighlightBackground"
-                            Fill="{DynamicResource CalendarViewItemBackgroundPointerOver}"
-                            Opacity="0"
-                            RadiusX="99"
-                            RadiusY="99" />
-                        <ContentPresenter
-                            x:Name="NormalText"
-                            Margin="5,1,5,1"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            TextBlock.Foreground="{DynamicResource CalendarViewForeground}" />
-                        <Rectangle
-                            x:Name="DayButtonFocusVisual"
-                            IsHitTestVisible="false"
-                            RadiusX="1"
-                            RadiusY="1"
-                            Visibility="Collapsed">
+                        <Rectangle x:Name="TodayBackground"
+                                   Fill="{DynamicResource CalendarViewTodayBackground}"
+                                   Opacity="0"
+                                   RadiusX="99"
+                                   RadiusY="99"
+                                   />
+                        <Rectangle x:Name="SelectedBackground"
+                                   Opacity="0"
+                                   RadiusX="99"
+                                   RadiusY="99"
+                                   Stroke="{DynamicResource CalendarViewSelectedBorderBrush}"
+                                   StrokeThickness="1"
+                                   />
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                />
+                        <Rectangle x:Name="HighlightBackground"
+                                   Fill="{DynamicResource CalendarViewItemBackgroundPointerOver}"
+                                   Opacity="0"
+                                   RadiusX="99"
+                                   RadiusY="99"
+                                   />
+                        <ContentPresenter x:Name="NormalText"
+                                          Margin="5,1,5,1"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          TextBlock.Foreground="{DynamicResource CalendarViewForeground}"
+                                          />
+                        <Rectangle x:Name="DayButtonFocusVisual"
+                                   IsHitTestVisible="false"
+                                   RadiusX="1"
+                                   RadiusY="1"
+                                   Visibility="Collapsed"
+                                   >
                             <Rectangle.Stroke>
-                                <SolidColorBrush Color="Transparent" />
+                                <SolidColorBrush Color="Transparent"/>
                             </Rectangle.Stroke>
                         </Rectangle>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup Name="CommonStates">
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0:0:0.1" />
+                                    <VisualTransition GeneratedDuration="0:0:0.1"/>
                                 </VisualStateGroup.Transitions>
-                                <VisualState Name="Normal" />
+                                <VisualState Name="Normal"/>
                                 <VisualState Name="MouseOver">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="HighlightBackground"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="HighlightBackground"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0"
+                                                         />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState Name="Pressed">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="HighlightBackground"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="HighlightBackground"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0"
+                                                         />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState Name="Disabled">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="HighlightBackground"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="0"
-                                            Duration="0" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="NormalText"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="HighlightBackground"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="0"
+                                                         Duration="0"
+                                                         />
+                                        <DoubleAnimation Storyboard.TargetName="NormalText"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0"
+                                                         />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
                             <VisualStateGroup Name="SelectionStates">
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
+                                    <VisualTransition GeneratedDuration="0"/>
                                 </VisualStateGroup.Transitions>
-                                <VisualState Name="Unselected" />
+                                <VisualState Name="Unselected"/>
                                 <VisualState Name="Selected">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="SelectedBackground"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="SelectedBackground"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0"
+                                                         />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
                             <VisualStateGroup Name="CalendarButtonFocusStates">
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
+                                    <VisualTransition GeneratedDuration="0"/>
                                 </VisualStateGroup.Transitions>
                                 <VisualState Name="CalendarButtonFocused">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames
-                                            Storyboard.TargetName="DayButtonFocusVisual"
-                                            Storyboard.TargetProperty="Visibility"
-                                            Duration="0">
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DayButtonFocusVisual"
+                                                                       Storyboard.TargetProperty="Visibility"
+                                                                       Duration="0"
+                                                                       >
                                             <DiscreteObjectKeyFrame KeyTime="0">
                                                 <DiscreteObjectKeyFrame.Value>
                                                     <Visibility>Visible</Visibility>
@@ -141,10 +143,10 @@
                                 </VisualState>
                                 <VisualState Name="CalendarButtonUnfocused">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames
-                                            Storyboard.TargetName="DayButtonFocusVisual"
-                                            Storyboard.TargetProperty="Visibility"
-                                            Duration="0">
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DayButtonFocusVisual"
+                                                                       Storyboard.TargetProperty="Visibility"
+                                                                       Duration="0"
+                                                                       >
                                             <DiscreteObjectKeyFrame KeyTime="0">
                                                 <DiscreteObjectKeyFrame.Value>
                                                     <Visibility>Collapsed</Visibility>
@@ -156,31 +158,35 @@
                             </VisualStateGroup>
                             <VisualStateGroup Name="ActiveStates">
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
+                                    <VisualTransition GeneratedDuration="0"/>
                                 </VisualStateGroup.Transitions>
-                                <VisualState Name="Active" />
+                                <VisualState Name="Active"/>
                             </VisualStateGroup>
                             <VisualStateGroup Name="DayStates">
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
+                                    <VisualTransition GeneratedDuration="0"/>
                                 </VisualStateGroup.Transitions>
-                                <VisualState Name="RegularDay" />
+                                <VisualState Name="RegularDay"/>
                                 <VisualState Name="Today">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="TodayBackground"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalText" Storyboard.TargetProperty="(TextBlock.Foreground)">
+                                        <DoubleAnimation Storyboard.TargetName="TodayBackground"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0"
+                                                         />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalText"
+                                                                       Storyboard.TargetProperty="(TextBlock.Foreground)"
+                                                                       >
                                             <ObjectAnimationUsingKeyFrames.KeyFrames>
-                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{DynamicResource CalendarViewTodayForeground}" />
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0"
+                                                                        Value="{DynamicResource CalendarViewTodayForeground}"
+                                                                        />
                                             </ObjectAnimationUsingKeyFrames.KeyFrames>
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
-                            <VisualStateGroup Name="BlackoutDayStates" />
+                            <VisualStateGroup Name="BlackoutDayStates"/>
                         </VisualStateManager.VisualStateGroups>
                     </Grid>
                 </ControlTemplate>
@@ -189,82 +195,88 @@
     </Style>
 
     <!--  HINT: Month/year/decade button style  -->
-    <Style x:Key="DefaultCalendarButtonStyle" TargetType="CalendarButton">
-        <Setter Property="MinWidth" Value="40" />
-        <Setter Property="MinHeight" Value="40" />
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Style x:Key="DefaultCalendarButtonStyle"
+           TargetType="CalendarButton"
+           >
+        <Setter Property="MinWidth" Value="40"/>
+        <Setter Property="MinHeight" Value="40"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="CalendarButton">
                     <Grid>
-                        <Rectangle
-                            x:Name="SelectedBackground"
-                            Fill="{DynamicResource CalendarViewSelectedBackground}"
-                            Opacity="0"
-                            RadiusX="99"
-                            RadiusY="99" />
-                        <Rectangle
-                            x:Name="Background"
-                            Fill="{DynamicResource CalendarViewItemBackgroundPointerOver}"
-                            Opacity="0"
-                            RadiusX="99"
-                            RadiusY="99" />
-                        <ContentPresenter
-                            x:Name="NormalText"
-                            Margin="1,0,1,1"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            TextBlock.Foreground="{DynamicResource CalendarViewForeground}" />
-                        <Rectangle
-                            x:Name="CalendarButtonFocusVisual"
-                            IsHitTestVisible="false"
-                            RadiusX="99"
-                            RadiusY="99"
-                            Stroke="{DynamicResource CalendarViewForeground}"
-                            Visibility="Collapsed" />
+                        <Rectangle x:Name="SelectedBackground"
+                                   Fill="{DynamicResource CalendarViewSelectedBackground}"
+                                   Opacity="0"
+                                   RadiusX="99"
+                                   RadiusY="99"
+                                   />
+                        <Rectangle x:Name="Background"
+                                   Fill="{DynamicResource CalendarViewItemBackgroundPointerOver}"
+                                   Opacity="0"
+                                   RadiusX="99"
+                                   RadiusY="99"
+                                   />
+                        <ContentPresenter x:Name="NormalText"
+                                          Margin="1,0,1,1"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          TextBlock.Foreground="{DynamicResource CalendarViewForeground}"
+                                          />
+                        <Rectangle x:Name="CalendarButtonFocusVisual"
+                                   IsHitTestVisible="false"
+                                   RadiusX="99"
+                                   RadiusY="99"
+                                   Stroke="{DynamicResource CalendarViewForeground}"
+                                   Visibility="Collapsed"
+                                   />
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup Name="CommonStates">
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0:0:0.1" />
+                                    <VisualTransition GeneratedDuration="0:0:0.1"/>
                                 </VisualStateGroup.Transitions>
-                                <VisualState Name="Normal" />
+                                <VisualState Name="Normal"/>
                                 <VisualState Name="MouseOver">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="Background"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="Background"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0"
+                                                         />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState Name="Pressed">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="Background"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="Background"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0"
+                                                         />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
                             <VisualStateGroup Name="SelectionStates">
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
+                                    <VisualTransition GeneratedDuration="0"/>
                                 </VisualStateGroup.Transitions>
-                                <VisualState Name="Unselected" />
+                                <VisualState Name="Unselected"/>
                                 <VisualState Name="Selected">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="SelectedBackground"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalText" Storyboard.TargetProperty="(TextBlock.Foreground)">
+                                        <DoubleAnimation Storyboard.TargetName="SelectedBackground"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0"
+                                                         />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalText"
+                                                                       Storyboard.TargetProperty="(TextBlock.Foreground)"
+                                                                       >
                                             <ObjectAnimationUsingKeyFrames.KeyFrames>
-                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{DynamicResource CalendarViewTodayForeground}" />
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0"
+                                                                        Value="{DynamicResource CalendarViewTodayForeground}"
+                                                                        />
                                             </ObjectAnimationUsingKeyFrames.KeyFrames>
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
@@ -272,20 +284,20 @@
                             </VisualStateGroup>
                             <VisualStateGroup Name="ActiveStates">
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
+                                    <VisualTransition GeneratedDuration="0"/>
                                 </VisualStateGroup.Transitions>
-                                <VisualState Name="Active" />
+                                <VisualState Name="Active"/>
                             </VisualStateGroup>
                             <VisualStateGroup Name="CalendarButtonFocusStates">
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
+                                    <VisualTransition GeneratedDuration="0"/>
                                 </VisualStateGroup.Transitions>
                                 <VisualState Name="CalendarButtonFocused">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames
-                                            Storyboard.TargetName="CalendarButtonFocusVisual"
-                                            Storyboard.TargetProperty="Visibility"
-                                            Duration="0">
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CalendarButtonFocusVisual"
+                                                                       Storyboard.TargetProperty="Visibility"
+                                                                       Duration="0"
+                                                                       >
                                             <DiscreteObjectKeyFrame KeyTime="0">
                                                 <DiscreteObjectKeyFrame.Value>
                                                     <Visibility>Visible</Visibility>
@@ -294,7 +306,7 @@
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
-                                <VisualState Name="CalendarButtonUnfocused" />
+                                <VisualState Name="CalendarButtonUnfocused"/>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </Grid>
@@ -303,176 +315,188 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultCalendarItemStyle" TargetType="{x:Type CalendarItem}">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultCalendarItemStyle"
+           TargetType="{x:Type CalendarItem}"
+           >
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type CalendarItem}">
-                    <Grid x:Name="PART_Root" Margin="12">
+                    <Grid x:Name="PART_Root"
+                          Margin="12"
+                          >
                         <Grid>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
                             </Grid.RowDefinitions>
 
                             <!--  HINT: Header with title and navigation buttons  -->
-                            <Grid Grid.Row="0" Margin="8,0,8,14">
+                            <Grid Grid.Row="0"
+                                  Margin="8,0,8,14"
+                                  >
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <controls:Button
-                                    x:Name="PART_HeaderButton"
-                                    Grid.Column="0"
-                                    Margin="-6,0,0,0"
-                                    Padding="6,2"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    Appearance="Secondary"
-                                    Background="Transparent"
-                                    BorderBrush="Transparent"
-                                    Focusable="False"
-                                    FontSize="14"
-                                    FontWeight="Bold"
-                                    Foreground="{DynamicResource CalendarViewForeground}" />
-                                <controls:Button
-                                    x:Name="PART_PreviousButton"
-                                    Grid.Column="1"
-                                    Width="26"
-                                    Height="26"
-                                    Margin="0,0,8,0"
-                                    Padding="0"
-                                    HorizontalAlignment="Right"
-                                    VerticalAlignment="Center"
-                                    Appearance="Secondary"
-                                    Background="Transparent"
-                                    BorderBrush="Transparent"
-                                    Content=""
-                                    Focusable="False"
-                                    Foreground="{DynamicResource CalendarViewButtonForeground}">
+                                <controls:Button x:Name="PART_HeaderButton"
+                                                 Grid.Column="0"
+                                                 Margin="-6,0,0,0"
+                                                 Padding="6,2"
+                                                 HorizontalAlignment="Left"
+                                                 VerticalAlignment="Center"
+                                                 Appearance="Secondary"
+                                                 Background="Transparent"
+                                                 BorderBrush="Transparent"
+                                                 Focusable="False"
+                                                 FontSize="14"
+                                                 FontWeight="Bold"
+                                                 Foreground="{DynamicResource CalendarViewForeground}"
+                                                 />
+                                <controls:Button x:Name="PART_PreviousButton"
+                                                 Grid.Column="1"
+                                                 Width="26"
+                                                 Height="26"
+                                                 Margin="0,0,8,0"
+                                                 Padding="0"
+                                                 HorizontalAlignment="Right"
+                                                 VerticalAlignment="Center"
+                                                 Appearance="Secondary"
+                                                 Background="Transparent"
+                                                 BorderBrush="Transparent"
+                                                 Content=""
+                                                 Focusable="False"
+                                                 Foreground="{DynamicResource CalendarViewButtonForeground}"
+                                                 >
                                     <controls:Button.Icon>
-                                        <controls:SymbolIcon
-                                            Filled="True"
-                                            FontSize="26"
-                                            Symbol="CaretUp20" />
+                                        <controls:SymbolIcon Filled="True"
+                                                             FontSize="26"
+                                                             Symbol="CaretUp20"
+                                                             />
                                     </controls:Button.Icon>
                                 </controls:Button>
-                                <controls:Button
-                                    x:Name="PART_NextButton"
-                                    Grid.Column="2"
-                                    Width="26"
-                                    Height="26"
-                                    Margin="0"
-                                    Padding="0"
-                                    HorizontalAlignment="Right"
-                                    VerticalAlignment="Center"
-                                    Appearance="Secondary"
-                                    Background="Transparent"
-                                    BorderBrush="Transparent"
-                                    Content=""
-                                    Focusable="False"
-                                    Foreground="{DynamicResource CalendarViewButtonForeground}">
+                                <controls:Button x:Name="PART_NextButton"
+                                                 Grid.Column="2"
+                                                 Width="26"
+                                                 Height="26"
+                                                 Margin="0"
+                                                 Padding="0"
+                                                 HorizontalAlignment="Right"
+                                                 VerticalAlignment="Center"
+                                                 Appearance="Secondary"
+                                                 Background="Transparent"
+                                                 BorderBrush="Transparent"
+                                                 Content=""
+                                                 Focusable="False"
+                                                 Foreground="{DynamicResource CalendarViewButtonForeground}"
+                                                 >
                                     <controls:Button.Icon>
-                                        <controls:SymbolIcon
-                                            Filled="True"
-                                            FontSize="26"
-                                            Symbol="CaretDown20" />
+                                        <controls:SymbolIcon Filled="True"
+                                                             FontSize="26"
+                                                             Symbol="CaretDown20"
+                                                             />
                                     </controls:Button.Icon>
                                 </controls:Button>
                             </Grid>
 
                             <!--  HINT: Day picker  -->
-                            <Grid
-                                x:Name="PART_MonthView"
-                                Grid.Row="1"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Visibility="Visible">
+                            <Grid x:Name="PART_MonthView"
+                                  Grid.Row="1"
+                                  HorizontalAlignment="Center"
+                                  VerticalAlignment="Center"
+                                  Visibility="Visible"
+                                  >
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
                             </Grid>
 
-                            <Border
-                                Grid.Row="1"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center">
-                                <Grid x:Name="PART_YearView" Visibility="Hidden">
+                            <Border Grid.Row="1"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    >
+                                <Grid x:Name="PART_YearView"
+                                      Visibility="Hidden"
+                                      >
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
                                     <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
                                     </Grid.RowDefinitions>
                                 </Grid>
                             </Border>
 
-                            <Rectangle
-                                x:Name="PART_DisabledVisual"
-                                Grid.Row="0"
-                                Grid.RowSpan="2"
-                                Opacity="0"
-                                RadiusX="2"
-                                RadiusY="2"
-                                Stretch="Fill"
-                                Stroke="Transparent"
-                                StrokeThickness="0"
-                                Visibility="Collapsed">
+                            <Rectangle x:Name="PART_DisabledVisual"
+                                       Grid.Row="0"
+                                       Grid.RowSpan="2"
+                                       Opacity="0"
+                                       RadiusX="2"
+                                       RadiusY="2"
+                                       Stretch="Fill"
+                                       Stroke="Transparent"
+                                       StrokeThickness="0"
+                                       Visibility="Collapsed"
+                                       >
                                 <Rectangle.Fill>
-                                    <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
+                                    <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}"/>
                                 </Rectangle.Fill>
                             </Rectangle>
                         </Grid>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_DisabledVisual" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_DisabledVisual" Property="Visibility" Value="Visible"/>
                         </Trigger>
-                        <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Year">
-                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Hidden" />
-                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
+                        <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}"
+                                     Value="Year"
+                                     >
+                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Hidden"/>
+                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible"/>
                         </DataTrigger>
-                        <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Decade">
-                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Hidden" />
-                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
+                        <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}"
+                                     Value="Decade"
+                                     >
+                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Hidden"/>
+                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible"/>
                         </DataTrigger>
                     </ControlTemplate.Triggers>
                     <ControlTemplate.Resources>
                         <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
-                            <TextBlock
-                                Margin="0,0,0,6"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                FontSize="12"
-                                FontWeight="SemiBold"
-                                Foreground="{DynamicResource CalendarViewForeground}"
-                                Text="{Binding}" />
+                            <TextBlock Margin="0,0,0,6"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       FontSize="12"
+                                       FontWeight="SemiBold"
+                                       Foreground="{DynamicResource CalendarViewForeground}"
+                                       Text="{Binding}"
+                                       />
                         </DataTemplate>
                     </ControlTemplate.Resources>
                 </ControlTemplate>
@@ -482,41 +506,45 @@
 
     <!--  https://developer.microsoft.com/en-us/fluentui#/controls/web/datepicker  -->
 
-    <Style x:Key="DefaultCalendarStyle" TargetType="{x:Type Calendar}">
-        <Setter Property="CalendarButtonStyle" Value="{StaticResource DefaultCalendarButtonStyle}" />
-        <Setter Property="CalendarDayButtonStyle" Value="{StaticResource DefaultCalendarDayButtonStyle}" />
-        <Setter Property="CalendarItemStyle" Value="{StaticResource DefaultCalendarItemStyle}" />
-        <Setter Property="Foreground" Value="{DynamicResource CalendarViewForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
+    <Style x:Key="DefaultCalendarStyle"
+           TargetType="{x:Type Calendar}"
+           >
+        <Setter Property="CalendarButtonStyle" Value="{StaticResource DefaultCalendarButtonStyle}"/>
+        <Setter Property="CalendarDayButtonStyle" Value="{StaticResource DefaultCalendarDayButtonStyle}"/>
+        <Setter Property="CalendarItemStyle" Value="{StaticResource DefaultCalendarItemStyle}"/>
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewForeground}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Calendar}">
-                    <Border
-                        x:Name="PART_Root"
-                        Margin="0"
-                        Padding="0"
-                        Background="{DynamicResource CalendarViewBackground}"
-                        BorderBrush="{DynamicResource CalendarViewBorderBrush}"
-                        BorderThickness="1"
-                        CornerRadius="8">
-                        <CalendarItem
-                            x:Name="PART_CalendarItem"
+                    <Border x:Name="PART_Root"
                             Margin="0"
                             Padding="0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Style="{TemplateBinding CalendarItemStyle}" />
+                            Background="{DynamicResource CalendarViewBackground}"
+                            BorderBrush="{DynamicResource CalendarViewBorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="8"
+                            >
+                        <CalendarItem x:Name="PART_CalendarItem"
+                                      Margin="0"
+                                      Padding="0"
+                                      HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Stretch"
+                                      Background="{TemplateBinding Background}"
+                                      BorderBrush="{TemplateBinding BorderBrush}"
+                                      BorderThickness="{TemplateBinding BorderThickness}"
+                                      Style="{TemplateBinding CalendarItemStyle}"
+                                      />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultCalendarStyle}" TargetType="{x:Type Calendar}" />
+    <Style BasedOn="{StaticResource DefaultCalendarStyle}"
+           TargetType="{x:Type Calendar}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/CalendarDatePicker/CalendarDatePicker.xaml b/src/Wpf.Ui/Controls/CalendarDatePicker/CalendarDatePicker.xaml
index bf23e745b..e5d816015 100644
--- a/src/Wpf.Ui/Controls/CalendarDatePicker/CalendarDatePicker.xaml
+++ b/src/Wpf.Ui/Controls/CalendarDatePicker/CalendarDatePicker.xaml
@@ -8,26 +8,28 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Button/Button.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Button/Button.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Style
-        x:Key="DefaultUiCalendarDatePickerStyle"
-        BasedOn="{StaticResource DefaultUiButtonStyle}"
-        TargetType="{x:Type controls:CalendarDatePicker}">
+    <Style x:Key="DefaultUiCalendarDatePickerStyle"
+           BasedOn="{StaticResource DefaultUiButtonStyle}"
+           TargetType="{x:Type controls:CalendarDatePicker}"
+           >
         <Setter Property="Icon">
             <Setter.Value>
-                <controls:SymbolIcon Symbol="CalendarRtl24" />
+                <controls:SymbolIcon Symbol="CalendarRtl24"/>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiCalendarDatePickerStyle}" TargetType="{x:Type controls:CalendarDatePicker}" />
+    <Style BasedOn="{StaticResource DefaultUiCalendarDatePickerStyle}"
+           TargetType="{x:Type controls:CalendarDatePicker}"
+           />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/Card/Card.xaml b/src/Wpf.Ui/Controls/Card/Card.xaml
index 7252afffa..60517d162 100644
--- a/src/Wpf.Ui/Controls/Card/Card.xaml
+++ b/src/Wpf.Ui/Controls/Card/Card.xaml
@@ -8,73 +8,75 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Thickness x:Key="CardPadding">14,16,14,16</Thickness>
     <Thickness x:Key="CardBorderThemeThickness">1</Thickness>
 
     <Style TargetType="{x:Type controls:Card}">
-        <Setter Property="Background" Value="{DynamicResource CardBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource CardForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource CardBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource CardPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource CardBackground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource CardForeground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource CardBorderThemeThickness}"/>
+        <Setter Property="Padding" Value="{StaticResource CardPadding}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:Card}">
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
 
-                        <Border
-                            x:Name="ContentBorder"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}">
-                            <ContentPresenter
-                                x:Name="ContentPresenter"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        <Border x:Name="ContentBorder"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                >
+                            <ContentPresenter x:Name="ContentPresenter"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              />
                         </Border>
 
-                        <Border
-                            x:Name="FooterBorder"
-                            Grid.Row="1"
-                            Padding="{TemplateBinding Padding}"
-                            Background="{DynamicResource CardFooterBackground}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="1"
-                            CornerRadius="0,0,4,4"
-                            Visibility="Collapsed">
-                            <ContentPresenter x:Name="FooterContentPresenter" Content="{TemplateBinding Footer}" />
+                        <Border x:Name="FooterBorder"
+                                Grid.Row="1"
+                                Padding="{TemplateBinding Padding}"
+                                Background="{DynamicResource CardFooterBackground}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="0,0,4,4"
+                                Visibility="Collapsed"
+                                >
+                            <ContentPresenter x:Name="FooterContentPresenter"
+                                              Content="{TemplateBinding Footer}"
+                                              />
                         </Border>
                     </Grid>
 
                     <ControlTemplate.Triggers>
                         <Trigger Property="HasFooter" Value="True">
-                            <Setter TargetName="FooterBorder" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="ContentBorder" Property="CornerRadius" Value="4,4,0,0" />
-                            <Setter TargetName="ContentBorder" Property="BorderThickness" Value="1,1,1,0" />
+                            <Setter TargetName="FooterBorder" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="ContentBorder" Property="CornerRadius" Value="4,4,0,0"/>
+                            <Setter TargetName="ContentBorder" Property="BorderThickness" Value="1,1,1,0"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/CardAction/CardAction.xaml b/src/Wpf.Ui/Controls/CardAction/CardAction.xaml
index d220cc3fe..594786343 100644
--- a/src/Wpf.Ui/Controls/CardAction/CardAction.xaml
+++ b/src/Wpf.Ui/Controls/CardAction/CardAction.xaml
@@ -8,11 +8,11 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                    >
 
     <Thickness x:Key="CardActionPadding">14,16,14,16</Thickness>
     <Thickness x:Key="CardActionBorderThemeThickness">1</Thickness>
@@ -21,106 +21,110 @@
     <system:Double x:Key="CardActionIconSize">24.0</system:Double>
     <system:Double x:Key="CardActionChevronSize">16.0</system:Double>
 
-    <Style x:Key="DefaultUiCardActionStyle" TargetType="{x:Type controls:CardAction}">
+    <Style x:Key="DefaultUiCardActionStyle"
+           TargetType="{x:Type controls:CardAction}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Background" Value="{DynamicResource CardBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource CardForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource CardActionBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource CardActionPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource CardBackground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource CardForeground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource CardActionBorderThemeThickness}"/>
+        <Setter Property="Padding" Value="{StaticResource CardActionPadding}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:CardAction}">
-                    <Border
-                        x:Name="ContentBorder"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        MinWidth="{TemplateBinding MinWidth}"
-                        MinHeight="{TemplateBinding MinHeight}"
-                        Padding="{TemplateBinding Padding}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}">
-                        <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <Border x:Name="ContentBorder"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                            >
+                        <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              >
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
 
-                            <ContentControl
-                                x:Name="ControlIcon"
-                                Grid.Column="0"
-                                Margin="{StaticResource CardActionIconMargin}"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding Icon}"
-                                Focusable="False"
-                                FontSize="{StaticResource CardActionIconSize}"
-                                Foreground="{TemplateBinding Foreground}"
-                                KeyboardNavigation.IsTabStop="False" />
+                            <ContentControl x:Name="ControlIcon"
+                                            Grid.Column="0"
+                                            Margin="{StaticResource CardActionIconMargin}"
+                                            VerticalAlignment="Center"
+                                            Content="{TemplateBinding Icon}"
+                                            Focusable="False"
+                                            FontSize="{StaticResource CardActionIconSize}"
+                                            Foreground="{TemplateBinding Foreground}"
+                                            KeyboardNavigation.IsTabStop="False"
+                                            />
 
-                            <ContentPresenter
-                                x:Name="ContentPresenter"
-                                Grid.Column="1"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding Content}"
-                                TextElement.Foreground="{TemplateBinding Foreground}" />
+                            <ContentPresenter x:Name="ContentPresenter"
+                                              Grid.Column="1"
+                                              VerticalAlignment="Center"
+                                              Content="{TemplateBinding Content}"
+                                              TextElement.Foreground="{TemplateBinding Foreground}"
+                                              />
 
-                            <controls:SymbolIcon
-                                x:Name="ChevronIcon"
-                                Grid.Column="2"
-                                Margin="{StaticResource CardActionChevronMargin}"
-                                VerticalAlignment="Center"
-                                FontSize="{StaticResource CardActionChevronSize}"
-                                Symbol="ChevronRight24" />
+                            <controls:SymbolIcon x:Name="ChevronIcon"
+                                                 Grid.Column="2"
+                                                 Margin="{StaticResource CardActionChevronMargin}"
+                                                 VerticalAlignment="Center"
+                                                 FontSize="{StaticResource CardActionChevronSize}"
+                                                 Symbol="ChevronRight24"
+                                                 />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource CardBackgroundPointerOver}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-                            <Setter Property="Foreground" Value="{DynamicResource CardForegroundPointerOver}" />
+                            <Setter Property="Background" Value="{DynamicResource CardBackgroundPointerOver}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource CardForegroundPointerOver}"/>
                         </Trigger>
                         <Trigger Property="IsChevronVisible" Value="False">
-                            <Setter TargetName="ChevronIcon" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="ChevronIcon" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource CardBackgroundDisabled}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrushDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundDisabled}" />
-                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource CardForegroundDisabled}" />
-                            <Setter TargetName="ChevronIcon" Property="Foreground" Value="{DynamicResource CardForegroundDisabled}" />
+                            <Setter Property="Background" Value="{DynamicResource CardBackgroundDisabled}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrushDisabled}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundDisabled}"/>
+                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource CardForegroundDisabled}"/>
+                            <Setter TargetName="ChevronIcon" Property="Foreground" Value="{DynamicResource CardForegroundDisabled}"/>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource CardBackgroundPressed}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrushPressed}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundPressed}" />
-                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource CardForegroundPressed}" />
-                            <Setter TargetName="ChevronIcon" Property="Foreground" Value="{DynamicResource CardForegroundPressed}" />
+                            <Setter Property="Background" Value="{DynamicResource CardBackgroundPressed}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrushPressed}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundPressed}"/>
+                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource CardForegroundPressed}"/>
+                            <Setter TargetName="ChevronIcon" Property="Foreground" Value="{DynamicResource CardForegroundPressed}"/>
                         </Trigger>
                         <Trigger Property="Content" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Content" Value="">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
-                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
+                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -128,6 +132,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiCardActionStyle}" TargetType="{x:Type controls:CardAction}" />
+    <Style BasedOn="{StaticResource DefaultUiCardActionStyle}"
+           TargetType="{x:Type controls:CardAction}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/CardColor/CardColor.xaml b/src/Wpf.Ui/Controls/CardColor/CardColor.xaml
index f9d50f1f2..57d286656 100644
--- a/src/Wpf.Ui/Controls/CardColor/CardColor.xaml
+++ b/src/Wpf.Ui/Controls/CardColor/CardColor.xaml
@@ -5,46 +5,46 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Style TargetType="{x:Type controls:CardColor}">
-        <Setter Property="Foreground" Value="{DynamicResource CardForeground}" />
-        <Setter Property="Background" Value="{DynamicResource CardBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrush}" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource CardForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource CardBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrush}"/>
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:CardColor}">
-                    <Border
-                        x:Name="CardBorder"
-                        Padding="8"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="1"
-                        CornerRadius="4">
+                    <Border x:Name="CardBorder"
+                            Padding="8"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="4"
+                            >
                         <StackPanel>
-                            <Border
-                                MinHeight="{Binding ActualWidth, RelativeSource={RelativeSource Self}}"
-                                Background="{TemplateBinding CardBrush}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="4" />
+                            <Border MinHeight="{Binding ActualWidth, RelativeSource={RelativeSource Self}}"
+                                    Background="{TemplateBinding CardBrush}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="4"
+                                    />
 
-                            <TextBlock
-                                Margin="0,8,0,0"
-                                FontSize="16"
-                                FontWeight="SemiBold"
-                                Text="{TemplateBinding Title}" />
-                            <TextBlock
-                                Margin="0"
-                                FontSize="{TemplateBinding SubtitleFontSize}"
-                                Foreground="{DynamicResource CardForegroundPressed}"
-                                Text="{TemplateBinding Subtitle}" />
+                            <TextBlock Margin="0,8,0,0"
+                                       FontSize="16"
+                                       FontWeight="SemiBold"
+                                       Text="{TemplateBinding Title}"
+                                       />
+                            <TextBlock Margin="0"
+                                       FontSize="{TemplateBinding SubtitleFontSize}"
+                                       Foreground="{DynamicResource CardForegroundPressed}"
+                                       Text="{TemplateBinding Subtitle}"
+                                       />
                         </StackPanel>
                     </Border>
                 </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/CardControl/CardControl.xaml b/src/Wpf.Ui/Controls/CardControl/CardControl.xaml
index 1c33c7e63..04d65dcea 100644
--- a/src/Wpf.Ui/Controls/CardControl/CardControl.xaml
+++ b/src/Wpf.Ui/Controls/CardControl/CardControl.xaml
@@ -8,11 +8,11 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                    >
 
     <Thickness x:Key="CardControlPadding">14,16,14,16</Thickness>
     <Thickness x:Key="CardControlBorderThemeThickness">1</Thickness>
@@ -20,105 +20,109 @@
     <Thickness x:Key="CardControlContentMargin">14,0,0,0</Thickness>
     <system:Double x:Key="CardControlIconSize">24.0</system:Double>
 
-    <Style x:Key="DefaultUiCardControlStyle" TargetType="{x:Type controls:CardControl}">
+    <Style x:Key="DefaultUiCardControlStyle"
+           TargetType="{x:Type controls:CardControl}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Background" Value="{DynamicResource CardBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource CardForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource CardControlBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource CardControlPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource CardBackground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource CardForeground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource CardControlBorderThemeThickness}"/>
+        <Setter Property="Padding" Value="{StaticResource CardControlPadding}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:CardControl}">
-                    <Border
-                        x:Name="ContentBorder"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        MinWidth="{TemplateBinding MinWidth}"
-                        MinHeight="{TemplateBinding MinHeight}"
-                        Padding="{TemplateBinding Padding}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <Border x:Name="ContentBorder"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            >
+                        <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              >
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
-                            <ContentControl
-                                x:Name="ControlIcon"
-                                Grid.Column="0"
-                                Margin="{StaticResource CardControlIconMargin}"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding Icon}"
-                                Focusable="False"
-                                FontSize="{StaticResource CardControlIconSize}"
-                                Foreground="{TemplateBinding Foreground}"
-                                KeyboardNavigation.IsTabStop="False" />
-                            <ContentPresenter
-                                x:Name="HeaderContentPresenter"
-                                Grid.Column="1"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding Header}"
-                                TextElement.Foreground="{TemplateBinding Foreground}" />
-                            <ContentPresenter
-                                x:Name="ContentPresenter"
-                                Grid.Column="2"
-                                Margin="{StaticResource CardControlContentMargin}"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding Content}"
-                                TextElement.Foreground="{TemplateBinding Foreground}" />
+                            <ContentControl x:Name="ControlIcon"
+                                            Grid.Column="0"
+                                            Margin="{StaticResource CardControlIconMargin}"
+                                            VerticalAlignment="Center"
+                                            Content="{TemplateBinding Icon}"
+                                            Focusable="False"
+                                            FontSize="{StaticResource CardControlIconSize}"
+                                            Foreground="{TemplateBinding Foreground}"
+                                            KeyboardNavigation.IsTabStop="False"
+                                            />
+                            <ContentPresenter x:Name="HeaderContentPresenter"
+                                              Grid.Column="1"
+                                              VerticalAlignment="Center"
+                                              Content="{TemplateBinding Header}"
+                                              TextElement.Foreground="{TemplateBinding Foreground}"
+                                              />
+                            <ContentPresenter x:Name="ContentPresenter"
+                                              Grid.Column="2"
+                                              Margin="{StaticResource CardControlContentMargin}"
+                                              VerticalAlignment="Center"
+                                              Content="{TemplateBinding Content}"
+                                              TextElement.Foreground="{TemplateBinding Foreground}"
+                                              />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource CardBackgroundPointerOver}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource CardBackgroundPointerOver}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource CardBackgroundDisabled}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrushDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundDisabled}" />
-                            <Setter TargetName="HeaderContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundDisabled}" />
-                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource CardForegroundDisabled}" />
+                            <Setter Property="Background" Value="{DynamicResource CardBackgroundDisabled}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrushDisabled}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundDisabled}"/>
+                            <Setter TargetName="HeaderContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundDisabled}"/>
+                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource CardForegroundDisabled}"/>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource CardBackgroundPressed}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrushPressed}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundPressed}" />
-                            <Setter TargetName="HeaderContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundPressed}" />
-                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource CardForegroundPressed}" />
+                            <Setter Property="Background" Value="{DynamicResource CardBackgroundPressed}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrushPressed}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundPressed}"/>
+                            <Setter TargetName="HeaderContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundPressed}"/>
+                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource CardForegroundPressed}"/>
                         </Trigger>
                         <Trigger Property="Content" Value="{x:Null}">
-                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0" />
+                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Content" Value="">
-                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0" />
+                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Header" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Header" Value="">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
-                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
+                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -126,6 +130,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiCardControlStyle}" TargetType="{x:Type controls:CardControl}" />
+    <Style BasedOn="{StaticResource DefaultUiCardControlStyle}"
+           TargetType="{x:Type controls:CardControl}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/CardExpander/CardExpander.xaml b/src/Wpf.Ui/Controls/CardExpander/CardExpander.xaml
index 25d1836db..f158fccc0 100644
--- a/src/Wpf.Ui/Controls/CardExpander/CardExpander.xaml
+++ b/src/Wpf.Ui/Controls/CardExpander/CardExpander.xaml
@@ -8,12 +8,12 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                    >
 
     <Thickness x:Key="CardExpanderPadding">14,16,14,16</Thickness>
     <Thickness x:Key="CardExpanderBorderThemeThickness">1</Thickness>
@@ -23,33 +23,37 @@
     <system:Double x:Key="CardExpanderIconSize">24.0</system:Double>
     <system:Double x:Key="CardExpanderChevronSize">16.0</system:Double>
 
-    <ControlTemplate x:Key="DefaultUiCardExpanderToggleButtonStyle" TargetType="{x:Type ToggleButton}">
-        <Grid Margin="{TemplateBinding Padding}" Background="Transparent">
+    <ControlTemplate x:Key="DefaultUiCardExpanderToggleButtonStyle"
+                     TargetType="{x:Type ToggleButton}"
+                     >
+        <Grid Margin="{TemplateBinding Padding}"
+              Background="Transparent"
+              >
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <ContentPresenter
-                x:Name="ContentPresenter"
-                Grid.Column="0"
-                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                Content="{TemplateBinding Content}" />
-            <Grid
-                x:Name="ChevronGrid"
-                Grid.Column="1"
-                Margin="0"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                RenderTransformOrigin="0.5, 0.5">
+            <ContentPresenter x:Name="ContentPresenter"
+                              Grid.Column="0"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Content}"
+                              />
+            <Grid x:Name="ChevronGrid"
+                  Grid.Column="1"
+                  Margin="0"
+                  VerticalAlignment="Center"
+                  Background="Transparent"
+                  RenderTransformOrigin="0.5, 0.5"
+                  >
                 <Grid.RenderTransform>
-                    <RotateTransform Angle="0" />
+                    <RotateTransform Angle="0"/>
                 </Grid.RenderTransform>
-                <controls:SymbolIcon
-                    x:Name="ControlChevronIcon"
-                    FontSize="{StaticResource CardExpanderChevronSize}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Symbol="ChevronDown24" />
+                <controls:SymbolIcon x:Name="ControlChevronIcon"
+                                     FontSize="{StaticResource CardExpanderChevronSize}"
+                                     Foreground="{TemplateBinding Foreground}"
+                                     Symbol="ChevronDown24"
+                                     />
             </Grid>
         </Grid>
         <ControlTemplate.Triggers>
@@ -57,22 +61,22 @@
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="ChevronGrid"
-                                Storyboard.TargetProperty="(Grid.RenderTransform).(RotateTransform.Angle)"
-                                To="180"
-                                Duration="00:00:00.167" />
+                            <DoubleAnimation Storyboard.TargetName="ChevronGrid"
+                                             Storyboard.TargetProperty="(Grid.RenderTransform).(RotateTransform.Angle)"
+                                             To="180"
+                                             Duration="00:00:00.167"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="ChevronGrid"
-                                Storyboard.TargetProperty="(Grid.RenderTransform).(RotateTransform.Angle)"
-                                To="0"
-                                Duration="00:00:00.167" />
+                            <DoubleAnimation Storyboard.TargetName="ChevronGrid"
+                                             Storyboard.TargetProperty="(Grid.RenderTransform).(RotateTransform.Angle)"
+                                             To="0"
+                                             Duration="00:00:00.167"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.ExitActions>
@@ -80,113 +84,123 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="DefaultUiCardExpanderStyle" TargetType="{x:Type controls:CardExpander}">
+    <Style x:Key="DefaultUiCardExpanderStyle"
+           TargetType="{x:Type controls:CardExpander}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Background" Value="{DynamicResource CardBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource CardForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource CardExpanderBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource CardExpanderPadding}" />
-        <Setter Property="ContentPadding" Value="{StaticResource CardExpanderPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="IsExpanded" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource CardBackground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource CardForeground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource CardExpanderBorderThemeThickness}"/>
+        <Setter Property="Padding" Value="{StaticResource CardExpanderPadding}"/>
+        <Setter Property="ContentPadding" Value="{StaticResource CardExpanderPadding}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="IsExpanded" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:CardExpander}">
                     <ControlTemplate.Resources>
-                        <converters:AnimationFactorToValueConverter x:Key="AnimationFactorToValueConverter" />
+                        <converters:AnimationFactorToValueConverter x:Key="AnimationFactorToValueConverter"/>
                     </ControlTemplate.Resources>
 
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
 
                         <!--  Top level controls always visible  -->
-                        <Border
-                            x:Name="ToggleButtonBorder"
-                            Grid.Row="0"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="1"
-                            CornerRadius="{TemplateBinding CornerRadius}">
-                            <ToggleButton
-                                x:Name="ExpanderToggleButton"
-                                Margin="0"
-                                Padding="{TemplateBinding Padding}"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                HorizontalContentAlignment="Stretch"
-                                VerticalContentAlignment="Center"
-                                FontSize="{TemplateBinding FontSize}"
-                                Foreground="{TemplateBinding Foreground}"
-                                IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                IsEnabled="{TemplateBinding IsEnabled}"
-                                OverridesDefaultStyle="True"
-                                Template="{StaticResource DefaultUiCardExpanderToggleButtonStyle}">
+                        <Border x:Name="ToggleButtonBorder"
+                                Grid.Row="0"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                >
+                            <ToggleButton x:Name="ExpanderToggleButton"
+                                          Margin="0"
+                                          Padding="{TemplateBinding Padding}"
+                                          HorizontalAlignment="Stretch"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalContentAlignment="Stretch"
+                                          VerticalContentAlignment="Center"
+                                          FontSize="{TemplateBinding FontSize}"
+                                          Foreground="{TemplateBinding Foreground}"
+                                          IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                          IsEnabled="{TemplateBinding IsEnabled}"
+                                          OverridesDefaultStyle="True"
+                                          Template="{StaticResource DefaultUiCardExpanderToggleButtonStyle}"
+                                          >
                                 <ToggleButton.Content>
                                     <Grid>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition Width="*"/>
                                         </Grid.ColumnDefinitions>
 
-                                        <ContentControl
-                                            x:Name="ControlIcon"
-                                            Grid.Column="0"
-                                            Margin="{StaticResource CardExpanderIconMargin}"
-                                            VerticalAlignment="Center"
-                                            Content="{TemplateBinding Icon}"
-                                            Focusable="False"
-                                            FontSize="{StaticResource CardExpanderIconSize}"
-                                            Foreground="{TemplateBinding Foreground}"
-                                            KeyboardNavigation.IsTabStop="False" />
+                                        <ContentControl x:Name="ControlIcon"
+                                                        Grid.Column="0"
+                                                        Margin="{StaticResource CardExpanderIconMargin}"
+                                                        VerticalAlignment="Center"
+                                                        Content="{TemplateBinding Icon}"
+                                                        Focusable="False"
+                                                        FontSize="{StaticResource CardExpanderIconSize}"
+                                                        Foreground="{TemplateBinding Foreground}"
+                                                        KeyboardNavigation.IsTabStop="False"
+                                                        />
 
-                                        <ContentPresenter
-                                            x:Name="HeaderContentPresenter"
-                                            Grid.Column="1"
-                                            Content="{TemplateBinding Header}"
-                                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                                        <ContentPresenter x:Name="HeaderContentPresenter"
+                                                          Grid.Column="1"
+                                                          Content="{TemplateBinding Header}"
+                                                          TextElement.Foreground="{TemplateBinding Foreground}"
+                                                          />
                                     </Grid>
                                 </ToggleButton.Content>
                             </ToggleButton>
                         </Border>
 
                         <!--  Collapsed content to expand  -->
-                        <Grid Grid.Row="1" ClipToBounds="True">
-                            <Border
-                                x:Name="ContentPresenterBorder"
-                                Background="{DynamicResource CardBackground}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="1,0,1,1"
-                                CornerRadius="0,0,4,4"
-                                Visibility="Collapsed">
-                                <ContentPresenter
-                                    x:Name="ContentPresenter"
-                                    Margin="{TemplateBinding ContentPadding}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Content="{TemplateBinding Content}" />
+                        <Grid Grid.Row="1"
+                              ClipToBounds="True"
+                              >
+                            <Border x:Name="ContentPresenterBorder"
+                                    Background="{DynamicResource CardBackground}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="1,0,1,1"
+                                    CornerRadius="0,0,4,4"
+                                    Visibility="Collapsed"
+                                    >
+                                <ContentPresenter x:Name="ContentPresenter"
+                                                  Margin="{TemplateBinding ContentPadding}"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  />
                                 <Border.Tag>
                                     <system:Double>0.0</system:Double>
                                 </Border.Tag>
                                 <Border.RenderTransform>
                                     <TranslateTransform>
                                         <TranslateTransform.Y>
-                                            <MultiBinding Converter="{StaticResource AnimationFactorToValueConverter}" ConverterParameter="negative">
-                                                <Binding ElementName="ContentPresenterBorder" Path="ActualHeight" />
-                                                <Binding ElementName="ContentPresenterBorder" Path="Tag" />
+                                            <MultiBinding Converter="{StaticResource AnimationFactorToValueConverter}"
+                                                          ConverterParameter="negative"
+                                                          >
+                                                <Binding ElementName="ContentPresenterBorder"
+                                                         Path="ActualHeight"
+                                                         />
+                                                <Binding ElementName="ContentPresenterBorder"
+                                                         Path="Tag"
+                                                         />
                                             </MultiBinding>
                                         </TranslateTransform.Y>
                                     </TranslateTransform>
@@ -197,19 +211,27 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsExpanded" Value="True">
                             <!--  TODO: Update  -->
-                            <Setter TargetName="ToggleButtonBorder" Property="CornerRadius" Value="4,4,0,0" />
+                            <Setter TargetName="ToggleButtonBorder" Property="CornerRadius" Value="4,4,0,0"/>
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder" Storyboard.TargetProperty="(Border.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder"
+                                                                       Storyboard.TargetProperty="(Border.Visibility)"
+                                                                       >
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{x:Static Visibility.Visible}"
+                                                                    />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder" Storyboard.TargetProperty="Tag">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1.0" />
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="0.0, 0.0, 0.0, 1.0"
-                                                KeyTime="0:0:0.333"
-                                                Value="0.0" />
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder"
+                                                                       Storyboard.TargetProperty="Tag"
+                                                                       >
+                                            <DiscreteDoubleKeyFrame KeyTime="0"
+                                                                    Value="1.0"
+                                                                    />
+                                            <SplineDoubleKeyFrame KeySpline="0.0, 0.0, 0.0, 1.0"
+                                                                  KeyTime="0:0:0.333"
+                                                                  Value="0.0"
+                                                                  />
                                         </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </BeginStoryboard>
@@ -217,30 +239,40 @@
                             <Trigger.ExitActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder" Storyboard.TargetProperty="(Border.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
-                                            <DiscreteObjectKeyFrame KeyTime="0:0:0.2" Value="{x:Static Visibility.Collapsed}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder"
+                                                                       Storyboard.TargetProperty="(Border.Visibility)"
+                                                                       >
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{x:Static Visibility.Visible}"
+                                                                    />
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0.2"
+                                                                    Value="{x:Static Visibility.Collapsed}"
+                                                                    />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder" Storyboard.TargetProperty="Tag">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0.0" />
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="1.0, 1.0, 0.0, 1.0"
-                                                KeyTime="0:0:0.167"
-                                                Value="1.0" />
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder"
+                                                                       Storyboard.TargetProperty="Tag"
+                                                                       >
+                                            <DiscreteDoubleKeyFrame KeyTime="0"
+                                                                    Value="0.0"
+                                                                    />
+                                            <SplineDoubleKeyFrame KeySpline="1.0, 1.0, 0.0, 1.0"
+                                                                  KeyTime="0:0:0.167"
+                                                                  Value="1.0"
+                                                                  />
                                         </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource CardBackgroundDisabled}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrushDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundDisabled}" />
-                            <Setter TargetName="ExpanderToggleButton" Property="Foreground" Value="{DynamicResource CardForegroundDisabled}" />
+                            <Setter Property="Background" Value="{DynamicResource CardBackgroundDisabled}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource CardBorderBrushDisabled}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CardForegroundDisabled}"/>
+                            <Setter TargetName="ExpanderToggleButton" Property="Foreground" Value="{DynamicResource CardForegroundDisabled}"/>
                         </Trigger>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
-                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
+                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -248,6 +280,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiCardExpanderStyle}" TargetType="{x:Type controls:CardExpander}" />
+    <Style BasedOn="{StaticResource DefaultUiCardExpanderStyle}"
+           TargetType="{x:Type controls:CardExpander}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/CheckBox/CheckBox.xaml b/src/Wpf.Ui/Controls/CheckBox/CheckBox.xaml
index 501634304..4f173ed54 100644
--- a/src/Wpf.Ui/Controls/CheckBox/CheckBox.xaml
+++ b/src/Wpf.Ui/Controls/CheckBox/CheckBox.xaml
@@ -8,12 +8,12 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
-    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"
+                    >
 
     <!--
         I don't see that CheckBox had combined states. Without it,
@@ -22,7 +22,7 @@
         Have to figure it out or make a new CheckBox control.
     -->
 
-    <converters:FallbackBrushConverter x:Key="FallbackBrushConverter" />
+    <converters:FallbackBrushConverter x:Key="FallbackBrushConverter"/>
 
     <Color x:Key="FallbackColor">#FFFF0000</Color>
 
@@ -33,120 +33,122 @@
     <system:Double x:Key="CheckBoxHeight">22</system:Double>
     <system:Double x:Key="CheckBoxWidth">22</system:Double>
 
-    <Style x:Key="DefaultCheckBoxStyle" TargetType="{x:Type CheckBox}">
+    <Style x:Key="DefaultCheckBoxStyle"
+           TargetType="{x:Type CheckBox}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Background" Value="{DynamicResource CheckBoxBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource CheckBoxBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource CheckBoxPadding}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
-        <Setter Property="Focusable" Value="True" />
-        <Setter Property="MinWidth" Value="120" />
-        <Setter Property="MinHeight" Value="32" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForeground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource CheckBoxBorderThemeThickness}"/>
+        <Setter Property="Padding" Value="{StaticResource CheckBoxPadding}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="True"/>
+        <Setter Property="Focusable" Value="True"/>
+        <Setter Property="MinWidth" Value="120"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type CheckBox}">
-                    <BulletDecorator
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="Transparent">
+                    <BulletDecorator HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                     VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                     Background="Transparent"
+                                     >
                         <BulletDecorator.Bullet>
-                            <Border
-                                x:Name="ControlBorderIconPresenter"
-                                Width="{StaticResource CheckBoxHeight}"
-                                Height="{StaticResource CheckBoxWidth}"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Background="{TemplateBinding Background}"
-                                CornerRadius="{TemplateBinding Border.CornerRadius}">
-                                <Border
-                                    x:Name="StrokeBorder"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{TemplateBinding Border.CornerRadius}">
+                            <Border x:Name="ControlBorderIconPresenter"
+                                    Width="{StaticResource CheckBoxHeight}"
+                                    Height="{StaticResource CheckBoxWidth}"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Background="{TemplateBinding Background}"
+                                    CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                    >
+                                <Border x:Name="StrokeBorder"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                        >
                                     <Grid>
-                                        <controls:SymbolIcon
-                                            x:Name="ControlIcon"
-                                            Margin="0"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontSize="{StaticResource CheckBoxIconSize}"
-                                            FontWeight="Bold"
-                                            Foreground="{DynamicResource CheckBoxCheckGlyphForeground}"
-                                            Symbol="Checkmark48"
-                                            Visibility="Collapsed" />
+                                        <controls:SymbolIcon x:Name="ControlIcon"
+                                                             Margin="0"
+                                                             HorizontalAlignment="Center"
+                                                             VerticalAlignment="Center"
+                                                             FontSize="{StaticResource CheckBoxIconSize}"
+                                                             FontWeight="Bold"
+                                                             Foreground="{DynamicResource CheckBoxCheckGlyphForeground}"
+                                                             Symbol="Checkmark48"
+                                                             Visibility="Collapsed"
+                                                             />
                                     </Grid>
                                 </Border>
                             </Border>
                         </BulletDecorator.Bullet>
-                        <ContentPresenter
-                            x:Name="ContentPresenter"
-                            Margin="{StaticResource CheckBoxContentMargin}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            RecognizesAccessKey="True" />
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          Margin="{StaticResource CheckBoxContentMargin}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          RecognizesAccessKey="True"
+                                          />
                     </BulletDecorator>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Content" Value="{x:Null}">
-                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0" />
-                            <Setter Property="MinWidth" Value="30" />
+                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0"/>
+                            <Setter Property="MinWidth" Value="30"/>
                         </Trigger>
                         <Trigger Property="Content" Value="">
-                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0" />
-                            <Setter Property="MinWidth" Value="30" />
+                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0"/>
+                            <Setter Property="MinWidth" Value="30"/>
                         </Trigger>
                         <Trigger Property="IsChecked" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Symbol" Value="Subtract16" />
-                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
-                            <Setter TargetName="StrokeBorder" Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBorderBrush}" />
+                            <Setter TargetName="ControlIcon" Property="Symbol" Value="Subtract16"/>
+                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}"/>
+                            <Setter TargetName="StrokeBorder" Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBorderBrush}"/>
                         </Trigger>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
-                            <Setter TargetName="StrokeBorder" Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBorderBrush}" />
+                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}"/>
+                            <Setter TargetName="StrokeBorder" Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBorderBrush}"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsChecked" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="StrokeBorder" Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
+                            <Setter TargetName="StrokeBorder" Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsChecked" Value="{x:Null}" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="{x:Null}"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
-                            <Setter TargetName="StrokeBorder" Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBorderBrush}" />
+                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}"/>
+                            <Setter TargetName="StrokeBorder" Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBorderBrush}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsChecked" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
-                            <Setter TargetName="StrokeBorder" Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBorderBrush}" />
+                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}"/>
+                            <Setter TargetName="StrokeBorder" Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBorderBrush}"/>
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
-                            <Setter TargetName="StrokeBorder" Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
-                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
+                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}"/>
+                            <Setter TargetName="StrokeBorder" Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}"/>
+                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -154,7 +156,9 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultCheckBoxStyle}" TargetType="{x:Type CheckBox}" />
+    <Style BasedOn="{StaticResource DefaultCheckBoxStyle}"
+           TargetType="{x:Type CheckBox}"
+           />
 
 </ResourceDictionary>
 
diff --git a/src/Wpf.Ui/Controls/ColorPicker/ColorPicker.xaml b/src/Wpf.Ui/Controls/ColorPicker/ColorPicker.xaml
index 26c78bc90..ee74b2ce8 100644
--- a/src/Wpf.Ui/Controls/ColorPicker/ColorPicker.xaml
+++ b/src/Wpf.Ui/Controls/ColorPicker/ColorPicker.xaml
@@ -8,10 +8,10 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
-    xmlns:system="clr-namespace:System;assembly=mscorlib" />
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"
+                    />
 
diff --git a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
index c33cebc9b..e959186cf 100644
--- a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
+++ b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
@@ -10,11 +10,11 @@
 
 <!--  TODO: Refactor editable and fix borders  -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                    >
 
     <Thickness x:Key="ComboBoxPadding">10,8,10,8</Thickness>
     <Thickness x:Key="ComboBoxBorderThemeThickness">1,1,1,1</Thickness>
@@ -25,119 +25,125 @@
     <system:Double x:Key="ComboBoxChevronSize">11.0</system:Double>
     <system:Double x:Key="ComboBoxPopupMinHeight">32.0</system:Double>
 
-    <Style x:Key="DefaultComboBoxTextBoxStyle" TargetType="{x:Type TextBox}">
+    <Style x:Key="DefaultComboBoxTextBoxStyle"
+           TargetType="{x:Type TextBox}"
+           >
         <!--  Focus by parent element  -->
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <!--  Focus by parent element  -->
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}"/>
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
-        <Setter Property="CaretBrush" Value="{DynamicResource ComboBoxForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Visibility" Value="Hidden" />
-        <Setter Property="Cursor" Value="IBeam" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}"/>
+        <Setter Property="CaretBrush" Value="{DynamicResource ComboBoxForeground}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Visibility" Value="Hidden"/>
+        <Setter Property="Cursor" Value="IBeam"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
-                    <controls:PassiveScrollViewer
-                        x:Name="PART_ContentHost"
-                        VerticalAlignment="Stretch"
-                        HorizontalAlignment="Stretch"
-                        Margin="{TemplateBinding Padding}"
-                        Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
-                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                    <controls:PassiveScrollViewer x:Name="PART_ContentHost"
+                                                  Margin="{TemplateBinding Padding}"
+                                                  HorizontalAlignment="Stretch"
+                                                  VerticalAlignment="Stretch"
+                                                  Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
+                                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                                  />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultComboBoxToggleButtonStyle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="DefaultComboBoxToggleButtonStyle"
+           TargetType="{x:Type ToggleButton}"
+           >
         <!--  Focus by parent element  -->
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <!--  Focus by parent element  -->
-        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Border.CornerRadius" Value="0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Border.CornerRadius" Value="0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Border
-                        x:Name="ContentBorder"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}">
-                        <ContentPresenter
-                            x:Name="PART_ContentHost"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+                    <Border x:Name="ContentBorder"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                            >
+                        <ContentPresenter x:Name="PART_ContentHost"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultComboBoxItemStyle" TargetType="{x:Type ComboBoxItem}">
+    <Style x:Key="DefaultComboBoxItemStyle"
+           TargetType="{x:Type ComboBoxItem}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Padding" Value="{StaticResource ComboBoxItemContentMargin}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Padding" Value="{StaticResource ComboBoxItemContentMargin}"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBoxItem}">
                     <Grid Background="Transparent">
-                        <Border
-                            Name="ContentBorder"
-                            Margin="{DynamicResource ComboBoxItemMargin}"
-                            Padding="0"
-                            VerticalAlignment="Stretch"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}"
-                            SnapsToDevicePixels="True">
+                        <Border Name="ContentBorder"
+                                Margin="{DynamicResource ComboBoxItemMargin}"
+                                Padding="0"
+                                VerticalAlignment="Stretch"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                SnapsToDevicePixels="True"
+                                >
                             <Grid>
-                                <ContentPresenter
-                                    x:Name="PART_ContentPresenter"
-                                    Margin="{TemplateBinding Padding}"
-                                    VerticalAlignment="Center" />
-                                <Rectangle
-                                    x:Name="ActiveRectangle"
-                                    Width="3"
-                                    Height="16"
-                                    Margin="0"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    Fill="{DynamicResource ComboBoxItemPillFillBrush}"
-                                    RadiusX="2"
-                                    RadiusY="2"
-                                    Visibility="Collapsed" />
+                                <ContentPresenter x:Name="PART_ContentPresenter"
+                                                  Margin="{TemplateBinding Padding}"
+                                                  VerticalAlignment="Center"
+                                                  />
+                                <Rectangle x:Name="ActiveRectangle"
+                                           Width="3"
+                                           Height="16"
+                                           Margin="0"
+                                           HorizontalAlignment="Left"
+                                           VerticalAlignment="Center"
+                                           Fill="{DynamicResource ComboBoxItemPillFillBrush}"
+                                           RadiusX="2"
+                                           RadiusY="2"
+                                           Visibility="Collapsed"
+                                           />
                             </Grid>
                         </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsHighlighted" Value="True">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelected}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelected}"/>
                         </Trigger>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}" />
+                            <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
+                            <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -145,52 +151,58 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultComboBoxStyle" TargetType="{x:Type ComboBox}">
+    <Style x:Key="DefaultComboBoxStyle"
+           TargetType="{x:Type ComboBox}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}"/>
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
-        <Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource ComboBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
-        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-        <Setter Property="Padding" Value="{DynamicResource ComboBoxPadding}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="Popup.PopupAnimation" Value="None" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource ComboBoxBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource ComboBoxBorderThemeThickness}"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden"/>
+        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}"/>
+        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}"/>
+        <Setter Property="Padding" Value="{DynamicResource ComboBoxPadding}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="Popup.PopupAnimation" Value="None"/>
         <!--  WPF doesn't like centering, the animation is ugly and the mouse button sometimes clicks right away.  -->
-        <Setter Property="Popup.Placement" Value="Bottom" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Popup.Placement" Value="Bottom"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBox}">
-                    <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                        <Border
-                            x:Name="ContentBorder"
-                            Grid.Row="0"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            Padding="0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}">
-                            <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                          >
+                        <Border x:Name="ContentBorder"
+                                Grid.Row="0"
+                                MinWidth="{TemplateBinding MinWidth}"
+                                MinHeight="{TemplateBinding MinHeight}"
+                                Padding="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                >
+                            <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  >
                                 <!--
                                     Funky grid - because:
                                     Chevron is over Presenter, ToggleButton is over Chevron, TextBox is over ToggleButton.
@@ -198,129 +210,135 @@
                                 -->
                                 <Grid>
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <Grid Grid.Column="0" Margin="{TemplateBinding Padding}">
-                                        <ContentPresenter
-                                            Name="PART_ContentPresenter"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            Content="{TemplateBinding SelectionBoxItem}"
-                                            ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                                            ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                            IsHitTestVisible="False"
-                                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                                    <Grid Grid.Column="0"
+                                          Margin="{TemplateBinding Padding}"
+                                          >
+                                        <ContentPresenter Name="PART_ContentPresenter"
+                                                          HorizontalAlignment="Stretch"
+                                                          VerticalAlignment="Stretch"
+                                                          Content="{TemplateBinding SelectionBoxItem}"
+                                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                                          IsHitTestVisible="False"
+                                                          TextElement.Foreground="{TemplateBinding Foreground}"
+                                                          />
                                     </Grid>
-                                    <Grid Grid.Column="1" Margin="{StaticResource ComboBoxChevronMargin}">
-                                        <controls:SymbolIcon
-                                            x:Name="ChevronIcon"
-                                            Margin="0"
-                                            VerticalAlignment="Center"
-                                            FontSize="{StaticResource ComboBoxChevronSize}"
-                                            Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}"
-                                            RenderTransformOrigin="0.5, 0.5"
-                                            Symbol="ChevronDown24">
+                                    <Grid Grid.Column="1"
+                                          Margin="{StaticResource ComboBoxChevronMargin}"
+                                          >
+                                        <controls:SymbolIcon x:Name="ChevronIcon"
+                                                             Margin="0"
+                                                             VerticalAlignment="Center"
+                                                             FontSize="{StaticResource ComboBoxChevronSize}"
+                                                             Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}"
+                                                             RenderTransformOrigin="0.5, 0.5"
+                                                             Symbol="ChevronDown24"
+                                                             >
                                             <controls:SymbolIcon.RenderTransform>
-                                                <RotateTransform Angle="0" />
+                                                <RotateTransform Angle="0"/>
                                             </controls:SymbolIcon.RenderTransform>
                                         </controls:SymbolIcon>
                                     </Grid>
-                                    <Grid
-                                        Grid.Column="0"
-                                        Grid.ColumnSpan="2"
-                                        Margin="0">
-                                        <ToggleButton
-                                            Name="ToggleButton"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            ClickMode="Press"
-                                            Focusable="False"
-                                            Foreground="{TemplateBinding Foreground}"
-                                            IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                            Style="{StaticResource DefaultComboBoxToggleButtonStyle}" />
+                                    <Grid Grid.Column="0"
+                                          Grid.ColumnSpan="2"
+                                          Margin="0"
+                                          >
+                                        <ToggleButton Name="ToggleButton"
+                                                      HorizontalAlignment="Stretch"
+                                                      VerticalAlignment="Stretch"
+                                                      ClickMode="Press"
+                                                      Focusable="False"
+                                                      Foreground="{TemplateBinding Foreground}"
+                                                      IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                                      Style="{StaticResource DefaultComboBoxToggleButtonStyle}"
+                                                      />
                                     </Grid>
-                                    <Grid Grid.Column="0" Margin="{TemplateBinding Padding}">
-                                        <TextBox
-                                            x:Name="PART_EditableTextBox"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            FontSize="{TemplateBinding FontSize}"
-                                            Foreground="{TemplateBinding Foreground}"
-                                            IsReadOnly="{TemplateBinding IsReadOnly}"
-                                            Style="{StaticResource DefaultComboBoxTextBoxStyle}" />
+                                    <Grid Grid.Column="0"
+                                          Margin="{TemplateBinding Padding}"
+                                          >
+                                        <TextBox x:Name="PART_EditableTextBox"
+                                                 HorizontalAlignment="Stretch"
+                                                 VerticalAlignment="Stretch"
+                                                 FontSize="{TemplateBinding FontSize}"
+                                                 Foreground="{TemplateBinding Foreground}"
+                                                 IsReadOnly="{TemplateBinding IsReadOnly}"
+                                                 Style="{StaticResource DefaultComboBoxTextBoxStyle}"
+                                                 />
                                     </Grid>
                                 </Grid>
-                                <Popup
-                                    x:Name="Popup"
-                                    MinWidth="{TemplateBinding ActualWidth}"
-                                    VerticalAlignment="Center"
-                                    AllowsTransparency="True"
-                                    Focusable="False"
-                                    IsOpen="{TemplateBinding IsDropDownOpen}"
-                                    Placement="{TemplateBinding Popup.Placement}"
-                                    PopupAnimation="{TemplateBinding Popup.PopupAnimation}"
-                                    VerticalOffset="1">
-                                    <Border
-                                        x:Name="DropDownBorder"
-                                        Margin="0"
-                                        Padding="0,4,0,6"
-                                        Background="{DynamicResource ComboBoxDropDownBackground}"
-                                        BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
-                                        BorderThickness="1"
-                                        CornerRadius="{DynamicResource PopupCornerRadius}"
-                                        SnapsToDevicePixels="True">
+                                <Popup x:Name="Popup"
+                                       MinWidth="{TemplateBinding ActualWidth}"
+                                       VerticalAlignment="Center"
+                                       AllowsTransparency="True"
+                                       Focusable="False"
+                                       IsOpen="{TemplateBinding IsDropDownOpen}"
+                                       Placement="{TemplateBinding Popup.Placement}"
+                                       PopupAnimation="{TemplateBinding Popup.PopupAnimation}"
+                                       VerticalOffset="1"
+                                       >
+                                    <Border x:Name="DropDownBorder"
+                                            Margin="0"
+                                            Padding="0,4,0,6"
+                                            Background="{DynamicResource ComboBoxDropDownBackground}"
+                                            BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
+                                            BorderThickness="1"
+                                            CornerRadius="{DynamicResource PopupCornerRadius}"
+                                            SnapsToDevicePixels="True"
+                                            >
                                         <Border.RenderTransform>
-                                            <TranslateTransform />
+                                            <TranslateTransform/>
                                         </Border.RenderTransform>
                                         <Grid>
-                                            <controls:DynamicScrollViewer
-                                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                                                Margin="0"
-                                                HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                                SnapsToDevicePixels="True"
-                                                TextElement.FontSize="{TemplateBinding FontSize}"
-                                                TextElement.FontWeight="{TemplateBinding FontWeight}"
-                                                TextElement.Foreground="{TemplateBinding Foreground}"
-                                                VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                                                <StackPanel
-                                                    IsItemsHost="True"
-                                                    KeyboardNavigation.DirectionalNavigation="Contained"
-                                                    TextElement.FontSize="{TemplateBinding FontSize}" />
+                                            <controls:DynamicScrollViewer MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                                                          Margin="0"
+                                                                          HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                                          SnapsToDevicePixels="True"
+                                                                          TextElement.FontSize="{TemplateBinding FontSize}"
+                                                                          TextElement.FontWeight="{TemplateBinding FontWeight}"
+                                                                          TextElement.Foreground="{TemplateBinding Foreground}"
+                                                                          VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                                          >
+                                                <StackPanel IsItemsHost="True"
+                                                            KeyboardNavigation.DirectionalNavigation="Contained"
+                                                            TextElement.FontSize="{TemplateBinding FontSize}"
+                                                            />
                                             </controls:DynamicScrollViewer>
                                         </Grid>
                                     </Border>
                                 </Popup>
                             </Grid>
                         </Border>
-                        <Border
-                            x:Name="AccentBorder"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            BorderBrush="{DynamicResource ComboBoxBorderBrushFocused}"
-                            BorderThickness="{StaticResource ComboBoxAccentBorderThemeThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}"
-                            Visibility="Collapsed" />
+                        <Border x:Name="AccentBorder"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                BorderBrush="{DynamicResource ComboBoxBorderBrushFocused}"
+                                BorderThickness="{StaticResource ComboBoxAccentBorderThemeThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                Visibility="Collapsed"
+                                />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsDropDownOpen" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ChevronIcon"
-                                            Storyboard.TargetProperty="(controls:SymbolIcon.RenderTransform).(RotateTransform.Angle)"
-                                            From="0"
-                                            To="180"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="DropDownBorder"
-                                            Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
-                                            From="-90"
-                                            To="0"
-                                            Duration="00:00:00.167">
+                                        <DoubleAnimation Storyboard.TargetName="ChevronIcon"
+                                                         Storyboard.TargetProperty="(controls:SymbolIcon.RenderTransform).(RotateTransform.Angle)"
+                                                         From="0"
+                                                         To="180"
+                                                         Duration="00:00:00.167"
+                                                         />
+                                        <DoubleAnimation Storyboard.TargetName="DropDownBorder"
+                                                         Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
+                                                         From="-90"
+                                                         To="0"
+                                                         Duration="00:00:00.167"
+                                                         >
                                             <DoubleAnimation.EasingFunction>
-                                                <CircleEase EasingMode="EaseOut" />
+                                                <CircleEase EasingMode="EaseOut"/>
                                             </DoubleAnimation.EasingFunction>
                                         </DoubleAnimation>
                                     </Storyboard>
@@ -329,51 +347,51 @@
                             <Trigger.ExitActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ChevronIcon"
-                                            Storyboard.TargetProperty="(controls:SymbolIcon.RenderTransform).(RotateTransform.Angle)"
-                                            From="180"
-                                            To="0"
-                                            Duration="00:00:00.167" />
+                                        <DoubleAnimation Storyboard.TargetName="ChevronIcon"
+                                                         Storyboard.TargetProperty="(controls:SymbolIcon.RenderTransform).(RotateTransform.Angle)"
+                                                         From="180"
+                                                         To="0"
+                                                         Duration="00:00:00.167"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
                         </Trigger>
                         <Trigger Property="HasItems" Value="False">
-                            <Setter TargetName="DropDownBorder" Property="MinHeight" Value="{StaticResource ComboBoxPopupMinHeight}" />
+                            <Setter TargetName="DropDownBorder" Property="MinHeight" Value="{StaticResource ComboBoxPopupMinHeight}"/>
                         </Trigger>
                         <Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="False">
-                            <Setter TargetName="DropDownBorder" Property="CornerRadius" Value="0" />
+                            <Setter TargetName="DropDownBorder" Property="CornerRadius" Value="0"/>
                         </Trigger>
                         <Trigger Property="IsGrouping" Value="True">
-                            <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
                         </Trigger>
                         <Trigger Property="IsEditable" Value="True">
-                            <Setter Property="IsTabStop" Value="False" />
-                            <Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="PART_ContentPresenter" Property="Visibility" Value="Hidden" />
+                            <Setter Property="IsTabStop" Value="False"/>
+                            <Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="PART_ContentPresenter" Property="Visibility" Value="Hidden"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True" />
-                                <Condition Property="IsKeyboardFocusWithin" Value="True" />
-                                <Condition Property="IsEditable" Value="True" />
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsKeyboardFocusWithin" Value="True"/>
+                                <Condition Property="IsEditable" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ComboBoxBackgroundFocused}" />
-                            <Setter TargetName="AccentBorder" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ComboBoxBackgroundFocused}"/>
+                            <Setter TargetName="AccentBorder" Property="Visibility" Value="Visible"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsKeyboardFocusWithin" Value="False" />
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsKeyboardFocusWithin" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ComboBoxBackgroundPointerOver}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ComboBoxBackgroundPointerOver}"/>
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
-                            <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -381,7 +399,11 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultComboBoxItemStyle}" TargetType="{x:Type ComboBoxItem}" />
-    <Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="{x:Type ComboBox}" />
+    <Style BasedOn="{StaticResource DefaultComboBoxItemStyle}"
+           TargetType="{x:Type ComboBoxItem}"
+           />
+    <Style BasedOn="{StaticResource DefaultComboBoxStyle}"
+           TargetType="{x:Type ComboBox}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.xaml b/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.xaml
index b0adce341..2e225ef8b 100644
--- a/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.xaml
+++ b/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.xaml
@@ -1,173 +1,191 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+                    >
 
-    <converters:ContentDialogButtonEnumToBoolConverter x:Key="EnumToBoolConverter" />
-    <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+    <converters:ContentDialogButtonEnumToBoolConverter x:Key="EnumToBoolConverter"/>
+    <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
 
     <CornerRadius x:Key="DialogOverlayCornerRadius">8,8,0,0</CornerRadius>
     <CornerRadius x:Key="DialogFooterCornerRadius">0,0,8,8</CornerRadius>
 
     <Style TargetType="{x:Type controls:ContentDialog}">
-        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource PopupCornerRadius}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="DialogMaxHeight" Value="850" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Padding" Value="24" />
-        <Setter Property="DialogMaxWidth" Value="1000" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="Focusable" Value="True" />
-        <Setter Property="KeyboardNavigation.TabNavigation" Value="Cycle" />
-        <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="Cycle" />
-        <Setter Property="DialogMargin" Value="35" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Foreground" Value="{DynamicResource ContentDialogForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ContentDialogBorderBrush}" />
-        <Setter Property="Background" Value="{DynamicResource ContentDialogBackground}" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource PopupCornerRadius}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="DialogMaxHeight" Value="850"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="Padding" Value="24"/>
+        <Setter Property="DialogMaxWidth" Value="1000"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="Focusable" Value="True"/>
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="Cycle"/>
+        <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="Cycle"/>
+        <Setter Property="DialogMargin" Value="35"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Foreground" Value="{DynamicResource ContentDialogForeground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ContentDialogBorderBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource ContentDialogBackground}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:ContentDialog}">
-                    <Grid Background="{DynamicResource ContentDialogSmokeFill}" Focusable="False">
+                    <Grid Background="{DynamicResource ContentDialogSmokeFill}"
+                          Focusable="False"
+                          >
 
-                        <Border
-                            MaxWidth="{TemplateBinding DialogWidth}"
-                            MaxHeight="{TemplateBinding DialogHeight}"
-                            Margin="{TemplateBinding DialogMargin}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}"
-                            Focusable="False"
-                            Opacity="1">
+                        <Border MaxWidth="{TemplateBinding DialogWidth}"
+                                MaxHeight="{TemplateBinding DialogHeight}"
+                                Margin="{TemplateBinding DialogMargin}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                Focusable="False"
+                                Opacity="1"
+                                >
                             <Border.Effect>
-                                <DropShadowEffect
-                                    BlurRadius="30"
-                                    Direction="0"
-                                    Opacity="0.4"
-                                    ShadowDepth="0"
-                                    Color="#202020" />
+                                <DropShadowEffect BlurRadius="30"
+                                                  Direction="0"
+                                                  Opacity="0.4"
+                                                  ShadowDepth="0"
+                                                  Color="#202020"
+                                                  />
                             </Border.Effect>
 
                             <Grid Focusable="False">
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
-                                <Border Background="{DynamicResource ContentDialogTopOverlay}" CornerRadius="{StaticResource DialogOverlayCornerRadius}" />
-                                <Grid
-                                    Grid.Row="0"
-                                    Margin="24,10"
-                                    Focusable="False">
+                                <Border Background="{DynamicResource ContentDialogTopOverlay}"
+                                        CornerRadius="{StaticResource DialogOverlayCornerRadius}"
+                                        />
+                                <Grid Grid.Row="0"
+                                      Margin="24,10"
+                                      Focusable="False"
+                                      >
                                     <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="*" />
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="*"/>
                                     </Grid.RowDefinitions>
 
-                                    <ContentPresenter
-                                        Grid.Row="0"
-                                        Margin="0,12,0,0"
-                                        Content="{TemplateBinding Title}"
-                                        ContentTemplate="{TemplateBinding TitleTemplate}"
-                                        TextBlock.FontSize="20"
-                                        TextBlock.FontWeight="SemiBold">
+                                    <ContentPresenter Grid.Row="0"
+                                                      Margin="0,12,0,0"
+                                                      Content="{TemplateBinding Title}"
+                                                      ContentTemplate="{TemplateBinding TitleTemplate}"
+                                                      TextBlock.FontSize="20"
+                                                      TextBlock.FontWeight="SemiBold"
+                                                      >
                                         <ContentPresenter.Resources>
-                                            <Style BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="{x:Type TextBlock}">
-                                                <Setter Property="TextWrapping" Value="WrapWithOverflow" />
+                                            <Style BasedOn="{StaticResource {x:Type TextBlock}}"
+                                                   TargetType="{x:Type TextBlock}"
+                                                   >
+                                                <Setter Property="TextWrapping" Value="WrapWithOverflow"/>
                                             </Style>
                                         </ContentPresenter.Resources>
                                     </ContentPresenter>
 
-                                    <controls:PassiveScrollViewer
-                                        x:Name="PART_ContentScroll"
-                                        Grid.Row="1"
-                                        Margin="0,20"
-                                        Padding="0,0,12,0"
-                                        CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
-                                        HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                        IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-                                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                                        <ContentPresenter
-                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                            Content="{TemplateBinding Content}"
-                                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}">
+                                    <controls:PassiveScrollViewer x:Name="PART_ContentScroll"
+                                                                  Grid.Row="1"
+                                                                  Margin="0,20"
+                                                                  Padding="0,0,12,0"
+                                                                  CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                                                                  HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                                  IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                                                                  VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                                  >
+                                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                          Content="{TemplateBinding Content}"
+                                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                          >
                                             <ContentPresenter.Resources>
-                                                <Style BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="{x:Type TextBlock}">
-                                                    <Setter Property="TextWrapping" Value="WrapWithOverflow" />
-                                                    <Setter Property="TextAlignment" Value="Justify" />
-                                                    <Setter Property="FontSize" Value="14" />
+                                                <Style BasedOn="{StaticResource {x:Type TextBlock}}"
+                                                       TargetType="{x:Type TextBlock}"
+                                                       >
+                                                    <Setter Property="TextWrapping" Value="WrapWithOverflow"/>
+                                                    <Setter Property="TextAlignment" Value="Justify"/>
+                                                    <Setter Property="FontSize" Value="14"/>
                                                 </Style>
                                             </ContentPresenter.Resources>
                                         </ContentPresenter>
                                     </controls:PassiveScrollViewer>
                                 </Grid>
 
-                                <Border
-                                    Grid.Row="1"
-                                    Padding="{TemplateBinding Padding}"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Bottom"
-                                    BorderBrush="{DynamicResource ContentDialogSeparatorBorderBrush}"
-                                    BorderThickness="0,1,0,0"
-                                    CornerRadius="{DynamicResource DialogFooterCornerRadius}"
-                                    Focusable="False"
-                                    Visibility="{TemplateBinding IsFooterVisible,
-                                                                 Converter={StaticResource BoolToVisibilityConverter}}">
+                                <Border Grid.Row="1"
+                                        Padding="{TemplateBinding Padding}"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Bottom"
+                                        BorderBrush="{DynamicResource ContentDialogSeparatorBorderBrush}"
+                                        BorderThickness="0,1,0,0"
+                                        CornerRadius="{DynamicResource DialogFooterCornerRadius}"
+                                        Focusable="False"
+                                        Visibility="{TemplateBinding IsFooterVisible,
+                                                                     Converter={StaticResource BoolToVisibilityConverter}}"
+                                        >
 
                                     <Grid>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition x:Name="PrimaryColumn" Width="*" />
-                                            <ColumnDefinition x:Name="FirstSpacer" Width="8" />
-                                            <ColumnDefinition x:Name="SecondaryColumn" Width="*" />
-                                            <ColumnDefinition x:Name="SecondSpacer" Width="8" />
-                                            <ColumnDefinition x:Name="CloseColumn" Width="*" />
+                                            <ColumnDefinition x:Name="PrimaryColumn"
+                                                              Width="*"
+                                                              />
+                                            <ColumnDefinition x:Name="FirstSpacer"
+                                                              Width="8"
+                                                              />
+                                            <ColumnDefinition x:Name="SecondaryColumn"
+                                                              Width="*"
+                                                              />
+                                            <ColumnDefinition x:Name="SecondSpacer"
+                                                              Width="8"
+                                                              />
+                                            <ColumnDefinition x:Name="CloseColumn"
+                                                              Width="*"
+                                                              />
                                         </Grid.ColumnDefinitions>
 
-                                        <controls:Button
-                                            Grid.Column="0"
-                                            HorizontalAlignment="Stretch"
-                                            Appearance="{TemplateBinding PrimaryButtonAppearance}"
-                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:ContentDialog}}, Mode=OneTime, Path=TemplateButtonCommand}"
-                                            CommandParameter="{x:Static controls:ContentDialogButton.Primary}"
-                                            Content="{TemplateBinding PrimaryButtonText}"
-                                            Icon="{TemplateBinding PrimaryButtonIcon}"
-                                            IsDefault="{TemplateBinding DefaultButton,
-                                                                        Converter={StaticResource EnumToBoolConverter},
-                                                                        ConverterParameter={x:Static controls:ContentDialogButton.Primary}}" />
+                                        <controls:Button Grid.Column="0"
+                                                         HorizontalAlignment="Stretch"
+                                                         Appearance="{TemplateBinding PrimaryButtonAppearance}"
+                                                         Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:ContentDialog}}, Mode=OneTime, Path=TemplateButtonCommand}"
+                                                         CommandParameter="{x:Static controls:ContentDialogButton.Primary}"
+                                                         Content="{TemplateBinding PrimaryButtonText}"
+                                                         Icon="{TemplateBinding PrimaryButtonIcon}"
+                                                         IsDefault="{TemplateBinding DefaultButton,
+                                                                                     Converter={StaticResource EnumToBoolConverter},
+                                                                                     ConverterParameter={x:Static controls:ContentDialogButton.Primary}}"
+                                                         />
 
-                                        <controls:Button
-                                            Grid.Column="2"
-                                            HorizontalAlignment="Stretch"
-                                            Appearance="{TemplateBinding SecondaryButtonAppearance}"
-                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:ContentDialog}}, Mode=OneTime, Path=TemplateButtonCommand}"
-                                            CommandParameter="{x:Static controls:ContentDialogButton.Secondary}"
-                                            Content="{TemplateBinding SecondaryButtonText}"
-                                            Icon="{TemplateBinding SecondaryButtonIcon}"
-                                            IsDefault="{TemplateBinding DefaultButton,
-                                                                        Converter={StaticResource EnumToBoolConverter},
-                                                                        ConverterParameter={x:Static controls:ContentDialogButton.Secondary}}" />
+                                        <controls:Button Grid.Column="2"
+                                                         HorizontalAlignment="Stretch"
+                                                         Appearance="{TemplateBinding SecondaryButtonAppearance}"
+                                                         Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:ContentDialog}}, Mode=OneTime, Path=TemplateButtonCommand}"
+                                                         CommandParameter="{x:Static controls:ContentDialogButton.Secondary}"
+                                                         Content="{TemplateBinding SecondaryButtonText}"
+                                                         Icon="{TemplateBinding SecondaryButtonIcon}"
+                                                         IsDefault="{TemplateBinding DefaultButton,
+                                                                                     Converter={StaticResource EnumToBoolConverter},
+                                                                                     ConverterParameter={x:Static controls:ContentDialogButton.Secondary}}"
+                                                         />
 
-                                        <controls:Button
-                                            Grid.Column="4"
-                                            HorizontalAlignment="Stretch"
-                                            Appearance="{TemplateBinding CloseButtonAppearance}"
-                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:ContentDialog}}, Mode=OneTime, Path=TemplateButtonCommand}"
-                                            CommandParameter="{x:Static controls:ContentDialogButton.Close}"
-                                            Content="{TemplateBinding CloseButtonText}"
-                                            Icon="{TemplateBinding CloseButtonIcon}"
-                                            IsCancel="True"
-                                            IsDefault="{TemplateBinding DefaultButton,
-                                                                        Converter={StaticResource EnumToBoolConverter},
-                                                                        ConverterParameter={x:Static controls:ContentDialogButton.Close}}" />
+                                        <controls:Button Grid.Column="4"
+                                                         HorizontalAlignment="Stretch"
+                                                         Appearance="{TemplateBinding CloseButtonAppearance}"
+                                                         Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:ContentDialog}}, Mode=OneTime, Path=TemplateButtonCommand}"
+                                                         CommandParameter="{x:Static controls:ContentDialogButton.Close}"
+                                                         Content="{TemplateBinding CloseButtonText}"
+                                                         Icon="{TemplateBinding CloseButtonIcon}"
+                                                         IsCancel="True"
+                                                         IsDefault="{TemplateBinding DefaultButton,
+                                                                                     Converter={StaticResource EnumToBoolConverter},
+                                                                                     ConverterParameter={x:Static controls:ContentDialogButton.Close}}"
+                                                         />
                                     </Grid>
                                 </Border>
                             </Grid>
@@ -176,26 +194,26 @@
 
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsPrimaryButtonEnabled" Value="False">
-                            <Setter TargetName="PrimaryColumn" Property="Width" Value="0" />
+                            <Setter TargetName="PrimaryColumn" Property="Width" Value="0"/>
                         </Trigger>
                         <Trigger Property="IsSecondaryButtonEnabled" Value="False">
-                            <Setter TargetName="FirstSpacer" Property="Width" Value="0" />
-                            <Setter TargetName="SecondaryColumn" Property="Width" Value="0" />
+                            <Setter TargetName="FirstSpacer" Property="Width" Value="0"/>
+                            <Setter TargetName="SecondaryColumn" Property="Width" Value="0"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsPrimaryButtonEnabled" Value="False" />
-                                <Condition Property="IsSecondaryButtonEnabled" Value="False" />
+                                <Condition Property="IsPrimaryButtonEnabled" Value="False"/>
+                                <Condition Property="IsSecondaryButtonEnabled" Value="False"/>
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="SecondSpacer" Property="Width" Value="0" />
+                                <Setter TargetName="SecondSpacer" Property="Width" Value="0"/>
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                         <Trigger Property="PrimaryButtonText" Value="">
-                            <Setter Property="IsPrimaryButtonEnabled" Value="False" />
+                            <Setter Property="IsPrimaryButtonEnabled" Value="False"/>
                         </Trigger>
                         <Trigger Property="SecondaryButtonText" Value="">
-                            <Setter Property="IsSecondaryButtonEnabled" Value="False" />
+                            <Setter Property="IsSecondaryButtonEnabled" Value="False"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/ContextMenu/ContextMenu.xaml b/src/Wpf.Ui/Controls/ContextMenu/ContextMenu.xaml
index d627afdcb..ce7659288 100644
--- a/src/Wpf.Ui/Controls/ContextMenu/ContextMenu.xaml
+++ b/src/Wpf.Ui/Controls/ContextMenu/ContextMenu.xaml
@@ -5,55 +5,57 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
-    <Style x:Key="UiContextMenu" TargetType="{x:Type ContextMenu}">
-        <Setter Property="TextElement.Foreground" Value="{DynamicResource ContextMenuForeground}" />
-        <Setter Property="Foreground" Value="{DynamicResource ContextMenuForeground}" />
-        <Setter Property="Background" Value="{DynamicResource ContextMenuBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ContextMenuBorderBrush}" />
-        <Setter Property="MinWidth" Value="140" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="HasDropShadow" Value="False" />
-        <Setter Property="Grid.IsSharedSizeScope" Value="True" />
-        <Setter Property="Popup.PopupAnimation" Value="None" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="UiContextMenu"
+           TargetType="{x:Type ContextMenu}"
+           >
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource ContextMenuForeground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ContextMenuForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource ContextMenuBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ContextMenuBorderBrush}"/>
+        <Setter Property="MinWidth" Value="140"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="HasDropShadow" Value="False"/>
+        <Setter Property="Grid.IsSharedSizeScope" Value="True"/>
+        <Setter Property="Popup.PopupAnimation" Value="None"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ContextMenu}">
-                    <Border
-                        x:Name="Border"
-                        Padding="0,3,0,3"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="1"
-                        CornerRadius="8">
+                    <Border x:Name="Border"
+                            Padding="0,3,0,3"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="8"
+                            >
                         <Border.RenderTransform>
-                            <TranslateTransform />
+                            <TranslateTransform/>
                         </Border.RenderTransform>
-                        <StackPanel
-                            ClipToBounds="True"
-                            IsItemsHost="True"
-                            KeyboardNavigation.DirectionalNavigation="Cycle"
-                            Orientation="Vertical" />
+                        <StackPanel ClipToBounds="True"
+                                    IsItemsHost="True"
+                                    KeyboardNavigation.DirectionalNavigation="Cycle"
+                                    Orientation="Vertical"
+                                    />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsOpen" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="Border"
-                                            Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
-                                            From="-90"
-                                            To="0"
-                                            Duration="00:00:00.167">
+                                        <DoubleAnimation Storyboard.TargetName="Border"
+                                                         Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
+                                                         From="-90"
+                                                         To="0"
+                                                         Duration="00:00:00.167"
+                                                         >
                                             <DoubleAnimation.EasingFunction>
-                                                <CircleEase EasingMode="EaseOut" />
+                                                <CircleEase EasingMode="EaseOut"/>
                                             </DoubleAnimation.EasingFunction>
                                         </DoubleAnimation>
                                     </Storyboard>
@@ -66,6 +68,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource UiContextMenu}" TargetType="{x:Type ContextMenu}" />
+    <Style BasedOn="{StaticResource UiContextMenu}"
+           TargetType="{x:Type ContextMenu}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ContextMenu/ContextMenuLoader.xaml b/src/Wpf.Ui/Controls/ContextMenu/ContextMenuLoader.xaml
index ac166654a..f9303b6f5 100644
--- a/src/Wpf.Ui/Controls/ContextMenu/ContextMenuLoader.xaml
+++ b/src/Wpf.Ui/Controls/ContextMenu/ContextMenuLoader.xaml
@@ -5,7 +5,7 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    x:Class="Wpf.Ui.Controls.ContextMenuLoader"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" />
+<ResourceDictionary x:Class="Wpf.Ui.Controls.ContextMenuLoader"
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    />
diff --git a/src/Wpf.Ui/Controls/DataGrid/DataGrid.xaml b/src/Wpf.Ui/Controls/DataGrid/DataGrid.xaml
index 46a301bbc..ec7e55e53 100644
--- a/src/Wpf.Ui/Controls/DataGrid/DataGrid.xaml
+++ b/src/Wpf.Ui/Controls/DataGrid/DataGrid.xaml
@@ -15,19 +15,19 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                    >
 
     <!--
         https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/main/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.xaml
     -->
 
     <!--  TODO  -->
-    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
     <system:Double x:Key="DefaultDataGridFontSize">14</system:Double>
 
     <Color x:Key="DisabledControlLightColor">#FFE8EDF9</Color>
@@ -43,57 +43,66 @@
     <Color x:Key="GlyphColor">#FF444444</Color>
 
     <LinearGradientBrush x:Key="MenuPopupBrush" StartPoint="0.5,0" EndPoint="0.5,1">
-        <GradientStop Offset="0" Color="{DynamicResource ControlLightColor}" />
-        <GradientStop Offset="0.5" Color="{DynamicResource ControlMediumColor}" />
-        <GradientStop Offset="1" Color="{DynamicResource ControlLightColor}" />
+        <GradientStop Offset="0" Color="{DynamicResource ControlLightColor}"/>
+        <GradientStop Offset="0.5" Color="{DynamicResource ControlMediumColor}"/>
+        <GradientStop Offset="1" Color="{DynamicResource ControlLightColor}"/>
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="ProgressBarIndicatorAnimatedFill" StartPoint="0,0" EndPoint="1,0">
         <LinearGradientBrush.GradientStops>
             <GradientStopCollection>
-                <GradientStop Offset="0" Color="#000000FF" />
-                <GradientStop Offset="0.4" Color="#600000FF" />
-                <GradientStop Offset="0.6" Color="#600000FF" />
-                <GradientStop Offset="1" Color="#000000FF" />
+                <GradientStop Offset="0" Color="#000000FF"/>
+                <GradientStop Offset="0.4" Color="#600000FF"/>
+                <GradientStop Offset="0.6" Color="#600000FF"/>
+                <GradientStop Offset="1" Color="#000000FF"/>
             </GradientStopCollection>
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
 
     <!--  END REMOVE COLORS  -->
 
-    <Style x:Key="DefaultDataGridCheckBoxColumnCellStyle" TargetType="{x:Type DataGridColumn}" />
+    <Style x:Key="DefaultDataGridCheckBoxColumnCellStyle"
+           TargetType="{x:Type DataGridColumn}"
+           />
 
-    <Style x:Key="{ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}" TargetType="{x:Type Button}">
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="{ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle,
+                                        TypeInTargetAssembly={x:Type DataGrid}}"
+           TargetType="{x:Type Button}"
+           >
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Grid>
-                        <Rectangle
-                            x:Name="Border"
-                            Fill="Transparent"
-                            SnapsToDevicePixels="True"
-                            Stroke="Transparent" />
-                        <Polygon
-                            x:Name="Arrow"
-                            Margin="8,8,3,3"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Bottom"
-                            Opacity="0.15"
-                            Points="0,10 10,10 10,0"
-                            Stretch="Uniform">
+                        <Rectangle x:Name="Border"
+                                   Fill="Transparent"
+                                   SnapsToDevicePixels="True"
+                                   Stroke="Transparent"
+                                   />
+                        <Polygon x:Name="Arrow"
+                                 Margin="8,8,3,3"
+                                 HorizontalAlignment="Right"
+                                 VerticalAlignment="Bottom"
+                                 Opacity="0.15"
+                                 Points="0,10 10,10 10,0"
+                                 Stretch="Uniform"
+                                 >
                             <Polygon.Fill>
-                                <SolidColorBrush Color="{DynamicResource GlyphColor}" />
+                                <SolidColorBrush Color="{DynamicResource GlyphColor}"/>
                             </Polygon.Fill>
                         </Polygon>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Normal"/>
                                 <VisualState x:Name="MouseOver">
 
                                     <Storyboard>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                            <EasingColorKeyFrame KeyTime="0" Value="{StaticResource ControlMouseOverColor}" />
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
+                                                                      Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)"
+                                                                      >
+                                            <EasingColorKeyFrame KeyTime="0"
+                                                                 Value="{StaticResource ControlMouseOverColor}"
+                                                                 />
                                         </ColorAnimationUsingKeyFrames>
                                     </Storyboard>
 
@@ -125,31 +134,33 @@
     </Style>
 
     <!--  Style and template for the DataGridCell.  -->
-    <Style x:Key="DefaultDataGridCellStyle" TargetType="{x:Type DataGridCell}">
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="MinHeight" Value="32" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultDataGridCellStyle"
+           TargetType="{x:Type DataGridCell}"
+           >
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridCell}">
-                    <Border
-                        x:Name="Border"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="Transparent"
-                        BorderBrush="Transparent"
-                        BorderThickness="0"
-                        SnapsToDevicePixels="True">
-                        <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    <Border x:Name="Border"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Background="Transparent"
+                            BorderBrush="Transparent"
+                            BorderThickness="0"
+                            SnapsToDevicePixels="True"
+                            >
+                        <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="FocusStates">
-                                <VisualState x:Name="Unfocused" />
-                                <VisualState x:Name="Focused" />
+                                <VisualState x:Name="Unfocused"/>
+                                <VisualState x:Name="Focused"/>
                             </VisualStateGroup>
                             <VisualStateGroup x:Name="CurrentStates">
-                                <VisualState x:Name="Regular" />
+                                <VisualState x:Name="Regular"/>
                                 <VisualState x:Name="Current">
                                     <!--
                                     <Storyboard>
@@ -168,61 +179,63 @@
     </Style>
 
     <!--  Style and template for the DataGridRow.  -->
-    <Style x:Key="DefaultDataGridRowStyle" TargetType="{x:Type DataGridRow}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+    <Style x:Key="DefaultDataGridRowStyle"
+           TargetType="{x:Type DataGridRow}"
+           >
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
         <Setter Property="ValidationErrorTemplate">
             <Setter.Value>
                 <ControlTemplate>
-                    <TextBlock
-                        Margin="2,0,0,0"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource SystemFillColorCriticalBrush}"
-                        Text="!" />
+                    <TextBlock Margin="2,0,0,0"
+                               VerticalAlignment="Center"
+                               Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+                               Text="!"
+                               />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridRow}">
-                    <Border
-                        x:Name="DGR_Border"
-                        Background="Transparent"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        SnapsToDevicePixels="True">
+                    <Border x:Name="DGR_Border"
+                            Background="Transparent"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True"
+                            >
                         <SelectiveScrollingGrid>
                             <SelectiveScrollingGrid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
                             </SelectiveScrollingGrid.ColumnDefinitions>
                             <SelectiveScrollingGrid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto"/>
                             </SelectiveScrollingGrid.RowDefinitions>
-                            <DataGridCellsPresenter
-                                Grid.Column="1"
-                                ItemsPanel="{TemplateBinding ItemsPanel}"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                            <DataGridDetailsPresenter
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
-                                Visibility="{TemplateBinding DetailsVisibility}" />
-                            <DataGridRowHeader
-                                Grid.Row="0"
-                                Grid.RowSpan="2"
-                                Grid.Column="0"
-                                SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
-                                Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
+                            <DataGridCellsPresenter Grid.Column="1"
+                                                    ItemsPanel="{TemplateBinding ItemsPanel}"
+                                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                    />
+                            <DataGridDetailsPresenter Grid.Row="1"
+                                                      Grid.Column="1"
+                                                      SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                                                      Visibility="{TemplateBinding DetailsVisibility}"
+                                                      />
+                            <DataGridRowHeader Grid.Row="0"
+                                               Grid.RowSpan="2"
+                                               Grid.Column="0"
+                                               SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
+                                               Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                                               />
                         </SelectiveScrollingGrid>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Normal"/>
 
                                 <!--  Provide a different appearance for every other row.  -->
                                 <VisualState x:Name="Normal_AlternatingRow">
@@ -377,52 +390,60 @@
     </Style>
 
     <!--  Style and template for the resize control on the DataGridRowHeader.  -->
-    <Style x:Key="RowHeaderGripperStyle" TargetType="{x:Type Thumb}">
-        <Setter Property="Height" Value="8" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Cursor" Value="SizeNS" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="RowHeaderGripperStyle"
+           TargetType="{x:Type Thumb}"
+           >
+        <Setter Property="Height" Value="8"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="SizeNS"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" />
+                    <Border Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
     <!--  Style and template for the DataGridRowHeader.  -->
-    <Style x:Key="DefaultDataGridRowHeaderStyle" TargetType="{x:Type DataGridRowHeader}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultDataGridRowHeaderStyle"
+           TargetType="{x:Type DataGridRowHeader}"
+           >
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridRowHeader}">
                     <Grid>
-                        <Border
-                            x:Name="rowHeaderBorder"
-                            Width="10"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="0,0,1,0">
+                        <Border x:Name="rowHeaderBorder"
+                                Width="10"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="0,0,1,0"
+                                >
                             <StackPanel Orientation="Horizontal">
-                                <ContentPresenter VerticalAlignment="Center" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                                <Control
-                                    SnapsToDevicePixels="False"
-                                    Template="{Binding ValidationErrorTemplate, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"
-                                    Visibility="{Binding (Validation.HasError), Converter={StaticResource BooleanToVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" />
+                                <ContentPresenter VerticalAlignment="Center"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                  />
+                                <Control SnapsToDevicePixels="False"
+                                         Template="{Binding ValidationErrorTemplate, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"
+                                         Visibility="{Binding (Validation.HasError), Converter={StaticResource BooleanToVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"
+                                         />
                             </StackPanel>
                         </Border>
 
-                        <Thumb
-                            x:Name="PART_TopHeaderGripper"
-                            VerticalAlignment="Top"
-                            Style="{StaticResource RowHeaderGripperStyle}" />
-                        <Thumb
-                            x:Name="PART_BottomHeaderGripper"
-                            VerticalAlignment="Bottom"
-                            Style="{StaticResource RowHeaderGripperStyle}" />
+                        <Thumb x:Name="PART_TopHeaderGripper"
+                               VerticalAlignment="Top"
+                               Style="{StaticResource RowHeaderGripperStyle}"
+                               />
+                        <Thumb x:Name="PART_BottomHeaderGripper"
+                               VerticalAlignment="Bottom"
+                               Style="{StaticResource RowHeaderGripperStyle}"
+                               />
                         <VisualStateManager.VisualStateGroups>
                             <!--
                                 This example does not specify an appearance for every
@@ -431,10 +452,10 @@
                                 in a specific state.
                             -->
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="Normal_CurrentRow" />
-                                <VisualState x:Name="Unfocused_EditingRow" />
-                                <VisualState x:Name="Normal_EditingRow" />
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="Normal_CurrentRow"/>
+                                <VisualState x:Name="Unfocused_EditingRow"/>
+                                <VisualState x:Name="Normal_EditingRow"/>
                                 <VisualState x:Name="MouseOver">
                                     <!--
                                     <Storyboard>
@@ -444,17 +465,17 @@
                                     </Storyboard>
                                     -->
                                 </VisualState>
-                                <VisualState x:Name="MouseOver_CurrentRow" />
-                                <VisualState x:Name="MouseOver_Unfocused_EditingRow" />
-                                <VisualState x:Name="MouseOver_EditingRow" />
-                                <VisualState x:Name="MouseOver_Unfocused_Selected" />
-                                <VisualState x:Name="MouseOver_Selected" />
-                                <VisualState x:Name="MouseOver_Unfocused_CurrentRow_Selected" />
-                                <VisualState x:Name="MouseOver_CurrentRow_Selected" />
-                                <VisualState x:Name="Unfocused_Selected" />
-                                <VisualState x:Name="Unfocused_CurrentRow_Selected" />
-                                <VisualState x:Name="Normal_CurrentRow_Selected" />
-                                <VisualState x:Name="Normal_Selected" />
+                                <VisualState x:Name="MouseOver_CurrentRow"/>
+                                <VisualState x:Name="MouseOver_Unfocused_EditingRow"/>
+                                <VisualState x:Name="MouseOver_EditingRow"/>
+                                <VisualState x:Name="MouseOver_Unfocused_Selected"/>
+                                <VisualState x:Name="MouseOver_Selected"/>
+                                <VisualState x:Name="MouseOver_Unfocused_CurrentRow_Selected"/>
+                                <VisualState x:Name="MouseOver_CurrentRow_Selected"/>
+                                <VisualState x:Name="Unfocused_Selected"/>
+                                <VisualState x:Name="Unfocused_CurrentRow_Selected"/>
+                                <VisualState x:Name="Normal_CurrentRow_Selected"/>
+                                <VisualState x:Name="Normal_Selected"/>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </Grid>
@@ -464,56 +485,62 @@
     </Style>
 
     <!--  Style and template for the resize control on the DataGridColumnHeader.  -->
-    <Style x:Key="ColumnHeaderGripperStyle" TargetType="{x:Type Thumb}">
-        <Setter Property="Width" Value="8" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Cursor" Value="SizeWE" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="ColumnHeaderGripperStyle"
+           TargetType="{x:Type Thumb}"
+           >
+        <Setter Property="Width" Value="8"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="SizeWE"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" />
+                    <Border Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
     <!--  Style and template for the DataGridColumnHeader.  -->
-    <Style x:Key="DefaultDataGridColumnHeaderStyle" TargetType="{x:Type DataGridColumnHeader}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="Padding" Value="12,0,0,0" />
-        <Setter Property="MinHeight" Value="32" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="SeparatorBrush" Value="{DynamicResource ControlFillColorDefault}" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultDataGridColumnHeaderStyle"
+           TargetType="{x:Type DataGridColumnHeader}"
+           >
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="Padding" Value="12,0,0,0"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="SeparatorBrush" Value="{DynamicResource ControlFillColorDefault}"/>
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridColumnHeader}">
                     <Grid>
-                        <Border
-                            x:Name="columnHeaderBorder"
-                            Padding="3,0,3,0"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="0,0,1,1">
-                            <ContentPresenter
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Border x:Name="columnHeaderBorder"
+                                Padding="3,0,3,0"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="0,0,1,1"
+                                >
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                              />
                         </Border>
 
-                        <Thumb
-                            x:Name="PART_LeftHeaderGripper"
-                            HorizontalAlignment="Left"
-                            Style="{StaticResource ColumnHeaderGripperStyle}" />
-                        <Thumb
-                            x:Name="PART_RightHeaderGripper"
-                            HorizontalAlignment="Right"
-                            Style="{StaticResource ColumnHeaderGripperStyle}" />
+                        <Thumb x:Name="PART_LeftHeaderGripper"
+                               HorizontalAlignment="Left"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"
+                               />
+                        <Thumb x:Name="PART_RightHeaderGripper"
+                               HorizontalAlignment="Right"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"
+                               />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -521,88 +548,96 @@
     </Style>
 
     <!--  Style and template for the DataGridColumnHeadersPresenter.  -->
-    <Style x:Key="DefaultDataGridColumnHeadersPresenterStyle" TargetType="{x:Type DataGridColumnHeadersPresenter}">
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultDataGridColumnHeadersPresenterStyle"
+           TargetType="{x:Type DataGridColumnHeadersPresenter}"
+           >
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridColumnHeadersPresenter}">
                     <Grid>
-                        <DataGridColumnHeader
-                            x:Name="PART_FillerColumnHeader"
-                            IsHitTestVisible="False"
-                            SeparatorVisibility="Collapsed" />
-                        <ItemsPresenter />
+                        <DataGridColumnHeader x:Name="PART_FillerColumnHeader"
+                                              IsHitTestVisible="False"
+                                              SeparatorVisibility="Collapsed"
+                                              />
+                        <ItemsPresenter/>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultDataGridCellsPresenterStyle" TargetType="{x:Type DataGridCellsPresenter}">
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultDataGridCellsPresenterStyle"
+           TargetType="{x:Type DataGridCellsPresenter}"
+           >
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridColumnHeadersPresenter}">
                     <Grid>
-                        <DataGridColumnHeader
-                            x:Name="PART_FillerColumnHeader"
-                            IsHitTestVisible="False"
-                            SeparatorVisibility="Collapsed" />
-                        <ItemsPresenter />
+                        <DataGridColumnHeader x:Name="PART_FillerColumnHeader"
+                                              IsHitTestVisible="False"
+                                              SeparatorVisibility="Collapsed"
+                                              />
+                        <ItemsPresenter/>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultDragIndicatorStyleStyle" TargetType="{x:Type Control}">
-        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultDragIndicatorStyleStyle"
+           TargetType="{x:Type Control}"
+           >
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <!--  DataGridColumnFloatingHeader  is  internal  -->
                 <ControlTemplate TargetType="Control">
                     <Grid Background="{TemplateBinding Background}">
-                        <Grid
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                        <Grid Margin="{TemplateBinding Padding}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              >
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" MinWidth="32" />
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"
+                                                  MinWidth="32"
+                                                  />
                             </Grid.ColumnDefinitions>
 
                             <!-- <ContentPresenter Content="{TemplateBinding Content}" /> -->
 
-                            <controls:SymbolIcon
-                                x:Name="SortIcon"
-                                Grid.Column="1"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                FontSize="12"
-                                Opacity="0"
-                                Symbol="TextSortAscending24" />
+                            <controls:SymbolIcon x:Name="SortIcon"
+                                                 Grid.Column="1"
+                                                 HorizontalAlignment="Center"
+                                                 VerticalAlignment="Center"
+                                                 FontSize="12"
+                                                 Opacity="0"
+                                                 Symbol="TextSortAscending24"
+                                                 />
                         </Grid>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="SortStates">
-                                <VisualState x:Name="Unsorted" />
+                                <VisualState x:Name="Unsorted"/>
                                 <VisualState x:Name="SortAscending">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="SortIcon"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="SortIcon"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0"
+                                                         />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="SortDescending">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="SortIcon"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="SortIcon"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="1"
+                                                         Duration="0"
+                                                         />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -613,140 +648,152 @@
         </Setter>
     </Style>
 
-    <Style x:Key="TextBoxStyle" TargetType="TextBox">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="MinWidth" Value="30" />
-        <Setter Property="Height" Value="20" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Background" Value="Yellow" />
+    <Style x:Key="TextBoxStyle"
+           TargetType="TextBox"
+           >
+        <Setter Property="Margin" Value="3"/>
+        <Setter Property="MinWidth" Value="30"/>
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Background" Value="Yellow"/>
         <Style.Triggers>
             <Trigger Property="IsReadOnly" Value="True">
-                <Setter Property="Background" Value="LightGray" />
+                <Setter Property="Background" Value="LightGray"/>
             </Trigger>
         </Style.Triggers>
     </Style>
     <Style TargetType="{x:Type DataGridTextColumn}">
-        <Setter Property="EditingElementStyle" Value="{StaticResource TextBoxStyle}" />
+        <Setter Property="EditingElementStyle" Value="{StaticResource TextBoxStyle}"/>
     </Style>
 
     <!--  Style and template for the DataGrid.  -->
-    <Style x:Key="DefaultDataGridStyle" TargetType="{x:Type DataGrid}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Style x:Key="DefaultDataGridStyle"
+           TargetType="{x:Type DataGrid}"
+           >
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="Background">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
+                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}"/>
             </Setter.Value>
         </Setter>
-        <Setter Property="RowBackground" Value="Transparent" />
+        <Setter Property="RowBackground" Value="Transparent"/>
         <Setter Property="Foreground">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}"/>
             </Setter.Value>
         </Setter>
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="FontSize" Value="{StaticResource DefaultDataGridFontSize}" />
-        <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-        <Setter Property="ScrollViewer.PanningMode" Value="Both" />
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="RowStyle" Value="{StaticResource DefaultDataGridRowStyle}" />
-        <Setter Property="RowHeaderStyle" Value="{StaticResource DefaultDataGridRowHeaderStyle}" />
-        <Setter Property="CellStyle" Value="{StaticResource DefaultDataGridCellStyle}" />
-        <Setter Property="ColumnHeaderStyle" Value="{StaticResource DefaultDataGridColumnHeaderStyle}" />
-        <Setter Property="DragIndicatorStyle" Value="{StaticResource DefaultDragIndicatorStyleStyle}" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="FontSize" Value="{StaticResource DefaultDataGridFontSize}"/>
+        <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="RowStyle" Value="{StaticResource DefaultDataGridRowStyle}"/>
+        <Setter Property="RowHeaderStyle" Value="{StaticResource DefaultDataGridRowHeaderStyle}"/>
+        <Setter Property="CellStyle" Value="{StaticResource DefaultDataGridCellStyle}"/>
+        <Setter Property="ColumnHeaderStyle" Value="{StaticResource DefaultDataGridColumnHeaderStyle}"/>
+        <Setter Property="DragIndicatorStyle" Value="{StaticResource DefaultDragIndicatorStyleStyle}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGrid}">
-                    <Border
-                        x:Name="border"
-                        Padding="{TemplateBinding Padding}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}"
-                        SnapsToDevicePixels="True">
-                        <controls:PassiveScrollViewer x:Name="DG_ScrollViewer" Focusable="False">
+                    <Border x:Name="border"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                            SnapsToDevicePixels="True"
+                            >
+                        <controls:PassiveScrollViewer x:Name="DG_ScrollViewer"
+                                                      Focusable="False"
+                                                      >
                             <controls:PassiveScrollViewer.Template>
                                 <ControlTemplate TargetType="{x:Type controls:PassiveScrollViewer}">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="Auto"/>
                                         </Grid.ColumnDefinitions>
                                         <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="*" />
-                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="*"/>
+                                            <RowDefinition Height="Auto"/>
                                         </Grid.RowDefinitions>
 
-                                        <Button
-                                            Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
-                                            Command="{x:Static DataGrid.SelectAllCommand}"
-                                            Focusable="false"
-                                            Style="{DynamicResource {ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle,
-                                                                                          TypeInTargetAssembly={x:Type DataGrid}}}"
-                                            Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
-
-                                        <DataGridColumnHeadersPresenter
-                                            x:Name="PART_ColumnHeadersPresenter"
-                                            Grid.Row="0"
-                                            Grid.Column="1"
-                                            Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
-
-                                        <ScrollContentPresenter
-                                            x:Name="PART_ScrollContentPresenter"
-                                            Grid.Row="1"
-                                            Grid.Column="0"
-                                            Grid.ColumnSpan="2"
-                                            CanContentScroll="{TemplateBinding CanContentScroll}" />
-
-                                        <ScrollBar
-                                            x:Name="PART_VerticalScrollBar"
-                                            Grid.Row="1"
-                                            Grid.Column="2"
-                                            Maximum="{TemplateBinding ScrollableHeight}"
-                                            Orientation="Vertical"
-                                            ViewportSize="{TemplateBinding ViewportHeight}"
-                                            Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
-                                            Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
-
-                                        <Grid Grid.Row="2" Grid.Column="1">
+                                        <Button Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                                                Command="{x:Static DataGrid.SelectAllCommand}"
+                                                Focusable="false"
+                                                Style="{DynamicResource {ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle,
+                                                                                              TypeInTargetAssembly={x:Type DataGrid}}}"
+                                                Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                                                />
+
+                                        <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter"
+                                                                        Grid.Row="0"
+                                                                        Grid.Column="1"
+                                                                        Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                                                                        />
+
+                                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter"
+                                                                Grid.Row="1"
+                                                                Grid.Column="0"
+                                                                Grid.ColumnSpan="2"
+                                                                CanContentScroll="{TemplateBinding CanContentScroll}"
+                                                                />
+
+                                        <ScrollBar x:Name="PART_VerticalScrollBar"
+                                                   Grid.Row="1"
+                                                   Grid.Column="2"
+                                                   Maximum="{TemplateBinding ScrollableHeight}"
+                                                   Orientation="Vertical"
+                                                   ViewportSize="{TemplateBinding ViewportHeight}"
+                                                   Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
+                                                   Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   />
+
+                                        <Grid Grid.Row="2"
+                                              Grid.Column="1"
+                                              >
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
-                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                                                <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
 
-                                            <ScrollBar
-                                                x:Name="PART_HorizontalScrollBar"
-                                                Grid.Column="1"
-                                                Maximum="{TemplateBinding ScrollableWidth}"
-                                                Orientation="Horizontal"
-                                                ViewportSize="{TemplateBinding ViewportWidth}"
-                                                Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
-                                                Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                                            <ScrollBar x:Name="PART_HorizontalScrollBar"
+                                                       Grid.Column="1"
+                                                       Maximum="{TemplateBinding ScrollableWidth}"
+                                                       Orientation="Horizontal"
+                                                       ViewportSize="{TemplateBinding ViewportWidth}"
+                                                       Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
+                                                       Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                                       />
                                         </Grid>
                                     </Grid>
                                 </ControlTemplate>
                             </controls:PassiveScrollViewer.Template>
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                         </controls:PassiveScrollViewer>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Disabled">
                                     <Storyboard>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="border" Storyboard.TargetProperty="(Panel.Background).                       (SolidColorBrush.Color)">
-                                            <EasingColorKeyFrame KeyTime="0" Value="{DynamicResource ControlLightColor}" />
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="border"
+                                                                      Storyboard.TargetProperty="(Panel.Background).                       (SolidColorBrush.Color)"
+                                                                      >
+                                            <EasingColorKeyFrame KeyTime="0"
+                                                                 Value="{DynamicResource ControlLightColor}"
+                                                                 />
                                         </ColorAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
-                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Normal"/>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </Border>
@@ -755,12 +802,12 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsGrouping" Value="True">
-                <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <converters:FallbackBrushConverter x:Key="FallbackBrushConverter" />
+    <converters:FallbackBrushConverter x:Key="FallbackBrushConverter"/>
 
     <Color x:Key="FallbackColor">#FFFF0000</Color>
 
@@ -771,133 +818,143 @@
     <system:Double x:Key="CheckBoxHeight">22</system:Double>
     <system:Double x:Key="CheckBoxWidth">22</system:Double>
 
-    <Style x:Key="DataGridCheckBoxElementDefaultStyle" TargetType="{x:Type CheckBox}">
+    <Style x:Key="DataGridCheckBoxElementDefaultStyle"
+           TargetType="{x:Type CheckBox}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Foreground">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}"/>
             </Setter.Value>
         </Setter>
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource CheckBoxBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource CheckBoxPadding}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
-        <Setter Property="Focusable" Value="True" />
-        <Setter Property="MinWidth" Value="120" />
-        <Setter Property="MinHeight" Value="32" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource CheckBoxBorderThemeThickness}"/>
+        <Setter Property="Padding" Value="{StaticResource CheckBoxPadding}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="True"/>
+        <Setter Property="Focusable" Value="True"/>
+        <Setter Property="MinWidth" Value="120"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type CheckBox}">
-                    <BulletDecorator
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="Transparent">
+                    <BulletDecorator HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                     VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                     Background="Transparent"
+                                     >
                         <BulletDecorator.Bullet>
-                            <Border
-                                x:Name="ControlBorderIconPresenter"
-                                Width="{StaticResource CheckBoxHeight}"
-                                Height="{StaticResource CheckBoxWidth}"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Border.CornerRadius}">
+                            <Border x:Name="ControlBorderIconPresenter"
+                                    Width="{StaticResource CheckBoxHeight}"
+                                    Height="{StaticResource CheckBoxWidth}"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                    >
                                 <Grid>
-                                    <controls:SymbolIcon
-                                        x:Name="ControlIcon"
-                                        Margin="0"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        FontSize="{StaticResource CheckBoxIconSize}"
-                                        FontWeight="Bold"
-                                        Symbol="Checkmark48"
-                                        Visibility="Collapsed">
+                                    <controls:SymbolIcon x:Name="ControlIcon"
+                                                         Margin="0"
+                                                         HorizontalAlignment="Center"
+                                                         VerticalAlignment="Center"
+                                                         FontSize="{StaticResource CheckBoxIconSize}"
+                                                         FontWeight="Bold"
+                                                         Symbol="Checkmark48"
+                                                         Visibility="Collapsed"
+                                                         >
                                         <controls:SymbolIcon.Foreground>
-                                            <SolidColorBrush Color="{DynamicResource TextOnAccentFillColorPrimary}" />
+                                            <SolidColorBrush Color="{DynamicResource TextOnAccentFillColorPrimary}"/>
                                         </controls:SymbolIcon.Foreground>
                                     </controls:SymbolIcon>
                                 </Grid>
                             </Border>
                         </BulletDecorator.Bullet>
-                        <ContentPresenter
-                            x:Name="ContentPresenter"
-                            Margin="{StaticResource CheckBoxContentMargin}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            RecognizesAccessKey="True" />
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          Margin="{StaticResource CheckBoxContentMargin}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          RecognizesAccessKey="True"
+                                          />
                     </BulletDecorator>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Content" Value="{x:Null}">
-                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0" />
+                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Content" Value="">
-                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0" />
+                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="IsChecked" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Symbol" Value="Subtract16" />
-                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="ControlIcon" Property="Symbol" Value="Subtract16"/>
+                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Visible"/>
                             <Setter TargetName="ControlBorderIconPresenter" Property="Background">
                                 <Setter.Value>
-                                    <SolidColorBrush Opacity="1.0" Color="{DynamicResource SystemAccentColorSecondary}" />
+                                    <SolidColorBrush Opacity="1.0"
+                                                     Color="{DynamicResource SystemAccentColorSecondary}"
+                                                     />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Visible"/>
                             <Setter TargetName="ControlBorderIconPresenter" Property="Background">
                                 <Setter.Value>
-                                    <SolidColorBrush Opacity="1.0" Color="{DynamicResource SystemAccentColorSecondary}" />
+                                    <SolidColorBrush Opacity="1.0"
+                                                     Color="{DynamicResource SystemAccentColorSecondary}"
+                                                     />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsChecked" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}" />
+                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsChecked" Value="{x:Null}" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="{x:Null}"/>
                             </MultiTrigger.Conditions>
                             <Setter TargetName="ControlBorderIconPresenter" Property="Background">
                                 <Setter.Value>
-                                    <SolidColorBrush Opacity="0.8" Color="{DynamicResource SystemAccentColorSecondary}" />
+                                    <SolidColorBrush Opacity="0.8"
+                                                     Color="{DynamicResource SystemAccentColorSecondary}"
+                                                     />
                                 </Setter.Value>
                             </Setter>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsChecked" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="True"/>
                             </MultiTrigger.Conditions>
                             <Setter TargetName="ControlBorderIconPresenter" Property="Background">
                                 <Setter.Value>
-                                    <SolidColorBrush Opacity="0.8" Color="{DynamicResource SystemAccentColorSecondary}" />
+                                    <SolidColorBrush Opacity="0.8"
+                                                     Color="{DynamicResource SystemAccentColorSecondary}"
+                                                     />
                                 </Setter.Value>
                             </Setter>
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}" />
-                            <Setter TargetName="ControlBorderIconPresenter" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
-                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
+                            <Setter TargetName="ControlBorderIconPresenter" Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}"/>
+                            <Setter TargetName="ControlBorderIconPresenter" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}"/>
+                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -905,23 +962,29 @@
         </Setter>
     </Style>
 
-    <Style
-        x:Key="DataGridCheckBoxEditingElementDefaultStyle"
-        BasedOn="{StaticResource DataGridCheckBoxElementDefaultStyle}"
-        TargetType="{x:Type CheckBox}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Style x:Key="DataGridCheckBoxEditingElementDefaultStyle"
+           BasedOn="{StaticResource DataGridCheckBoxElementDefaultStyle}"
+           TargetType="{x:Type CheckBox}"
+           >
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
     </Style>
 
-    <Style
-        x:Key="DefaultUiDataGridStyle"
-        BasedOn="{StaticResource DefaultDataGridStyle}"
-        TargetType="{x:Type controls:DataGrid}">
-        <Setter Property="CheckBoxColumnEditingElementStyle" Value="{StaticResource DataGridCheckBoxEditingElementDefaultStyle}" />
-        <Setter Property="CheckBoxColumnElementStyle" Value="{StaticResource DataGridCheckBoxElementDefaultStyle}" />
+    <Style x:Key="DefaultUiDataGridStyle"
+           BasedOn="{StaticResource DefaultDataGridStyle}"
+           TargetType="{x:Type controls:DataGrid}"
+           >
+        <Setter Property="CheckBoxColumnEditingElementStyle" Value="{StaticResource DataGridCheckBoxEditingElementDefaultStyle}"/>
+        <Setter Property="CheckBoxColumnElementStyle" Value="{StaticResource DataGridCheckBoxElementDefaultStyle}"/>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultDataGridColumnHeadersPresenterStyle}" TargetType="{x:Type DataGridColumnHeadersPresenter}" />
-    <Style BasedOn="{StaticResource DefaultDataGridStyle}" TargetType="{x:Type DataGrid}" />
-    <Style BasedOn="{StaticResource DefaultUiDataGridStyle}" TargetType="{x:Type controls:DataGrid}" />
+    <Style BasedOn="{StaticResource DefaultDataGridColumnHeadersPresenterStyle}"
+           TargetType="{x:Type DataGridColumnHeadersPresenter}"
+           />
+    <Style BasedOn="{StaticResource DefaultDataGridStyle}"
+           TargetType="{x:Type DataGrid}"
+           />
+    <Style BasedOn="{StaticResource DefaultUiDataGridStyle}"
+           TargetType="{x:Type controls:DataGrid}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml b/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
index c7e7415b2..56eaf8254 100644
--- a/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
+++ b/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
@@ -8,11 +8,11 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"
+                    >
 
     <Thickness x:Key="DatePickerBorderThemeThickness">1,1,1,0</Thickness>
     <Thickness x:Key="DatePickerAccentBorderThemeThickness">0,0,0,1</Thickness>
@@ -23,193 +23,201 @@
     <system:Double x:Key="DatePickerCalendarButtonHeight">24</system:Double>
     <system:Double x:Key="DatePickerCalendarButtonIconSize">14</system:Double>
 
-    <Style x:Key="DefaultDatePickerTextBoxStyle" TargetType="{x:Type DatePickerTextBox}">
+    <Style x:Key="DefaultDatePickerTextBoxStyle"
+           TargetType="{x:Type DatePickerTextBox}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Foreground">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}"/>
             </Setter.Value>
         </Setter>
         <Setter Property="CaretBrush">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}"/>
             </Setter.Value>
         </Setter>
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DatePickerTextBox}">
                     <Border Margin="{TemplateBinding Margin}">
-                        <Decorator x:Name="PART_ContentHost" Margin="{TemplateBinding Padding}" />
+                        <Decorator x:Name="PART_ContentHost"
+                                   Margin="{TemplateBinding Padding}"
+                                   />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultDatePickerStyle" TargetType="{x:Type DatePicker}">
+    <Style x:Key="DefaultDatePickerStyle"
+           TargetType="{x:Type DatePicker}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}"/>
         <!--  Universal WPF UI ContextMenu  -->
         <!--  Default WPF UI Calendar style  -->
-        <Setter Property="CalendarStyle" Value="{DynamicResource DefaultCalendarStyle}" />
+        <Setter Property="CalendarStyle" Value="{DynamicResource DefaultCalendarStyle}"/>
         <!--  Default WPF UI Calendar style  -->
         <Setter Property="Foreground">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}"/>
             </Setter.Value>
         </Setter>
         <Setter Property="Background">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
+                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}"/>
             </Setter.Value>
         </Setter>
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource DatePickerBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource DatePickerBorderThemeThickness}"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}"/>
+        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}"/>
+        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DatePicker}">
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <Grid
-                            Grid.Row="0"
-                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                            <Border
-                                x:Name="ContentBorder"
-                                MinWidth="{TemplateBinding MinWidth}"
-                                MinHeight="{TemplateBinding MinHeight}"
-                                Padding="0"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Border.CornerRadius}">
-                                <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                        <Grid Grid.Row="0"
+                              HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                              >
+                            <Border x:Name="ContentBorder"
+                                    MinWidth="{TemplateBinding MinWidth}"
+                                    MinHeight="{TemplateBinding MinHeight}"
+                                    Padding="0"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                    >
+                                <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      >
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
                                     <Grid Grid.Column="0">
-                                        <DatePickerTextBox
-                                            x:Name="PART_TextBox"
-                                            Margin="0"
-                                            Padding="{TemplateBinding Padding}"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            ContextMenu="{TemplateBinding ContextMenu}"
-                                            Focusable="{TemplateBinding Focusable}"
-                                            Foreground="{TemplateBinding Foreground}" />
+                                        <DatePickerTextBox x:Name="PART_TextBox"
+                                                           Margin="0"
+                                                           Padding="{TemplateBinding Padding}"
+                                                           HorizontalAlignment="Stretch"
+                                                           VerticalAlignment="Stretch"
+                                                           ContextMenu="{TemplateBinding ContextMenu}"
+                                                           Focusable="{TemplateBinding Focusable}"
+                                                           Foreground="{TemplateBinding Foreground}"
+                                                           />
                                     </Grid>
                                     <!--  Buttons and Icons have no padding from the main element to allow absolute positions if height is larger than the text entry zone  -->
-                                    <controls:Button
-                                        x:Name="PART_Button"
-                                        Grid.Column="1"
-                                        Width="{StaticResource DatePickerCalendarButtonHeight}"
-                                        Height="{StaticResource DatePickerCalendarButtonHeight}"
-                                        Margin="{StaticResource DatePickerCalendarButtonMargin}"
-                                        Padding="{StaticResource DatePickerCalendarButtonPadding}"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Top"
-                                        HorizontalContentAlignment="Center"
-                                        VerticalContentAlignment="Center"
-                                        Appearance="Secondary"
-                                        Background="Transparent"
-                                        BorderBrush="Transparent"
-                                        Cursor="Arrow">
+                                    <controls:Button x:Name="PART_Button"
+                                                     Grid.Column="1"
+                                                     Width="{StaticResource DatePickerCalendarButtonHeight}"
+                                                     Height="{StaticResource DatePickerCalendarButtonHeight}"
+                                                     Margin="{StaticResource DatePickerCalendarButtonMargin}"
+                                                     Padding="{StaticResource DatePickerCalendarButtonPadding}"
+                                                     HorizontalAlignment="Center"
+                                                     VerticalAlignment="Top"
+                                                     HorizontalContentAlignment="Center"
+                                                     VerticalContentAlignment="Center"
+                                                     Appearance="Secondary"
+                                                     Background="Transparent"
+                                                     BorderBrush="Transparent"
+                                                     Cursor="Arrow"
+                                                     >
                                         <!--  WPF overrides paddings for button  -->
-                                        <controls:SymbolIcon
-                                            Margin="{StaticResource DatePickerCalendarButtonPadding}"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontSize="{StaticResource DatePickerCalendarButtonIconSize}"
-                                            Foreground="{TemplateBinding Foreground}"
-                                            Symbol="CalendarRtl24" />
+                                        <controls:SymbolIcon Margin="{StaticResource DatePickerCalendarButtonPadding}"
+                                                             HorizontalAlignment="Center"
+                                                             VerticalAlignment="Center"
+                                                             FontSize="{StaticResource DatePickerCalendarButtonIconSize}"
+                                                             Foreground="{TemplateBinding Foreground}"
+                                                             Symbol="CalendarRtl24"
+                                                             />
                                     </controls:Button>
                                 </Grid>
                             </Border>
                             <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
-                            <Border
-                                x:Name="AccentBorder"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                BorderThickness="{StaticResource DatePickerAccentBorderThemeThickness}"
-                                CornerRadius="{TemplateBinding Border.CornerRadius}">
+                            <Border x:Name="AccentBorder"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch"
+                                    BorderThickness="{StaticResource DatePickerAccentBorderThemeThickness}"
+                                    CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                    >
                                 <Border.BorderBrush>
-                                    <SolidColorBrush Color="{DynamicResource ControlStrongStrokeColorDefault}" />
+                                    <SolidColorBrush Color="{DynamicResource ControlStrongStrokeColorDefault}"/>
                                 </Border.BorderBrush>
                             </Border>
                         </Grid>
-                        <Popup
-                            x:Name="PART_Popup"
-                            Grid.Row="1"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Top"
-                            AllowsTransparency="True"
-                            Placement="Mouse"
-                            PlacementTarget="{Binding ElementName=PART_TextBox}"
-                            StaysOpen="False" />
+                        <Popup x:Name="PART_Popup"
+                               Grid.Row="1"
+                               HorizontalAlignment="Stretch"
+                               VerticalAlignment="Top"
+                               AllowsTransparency="True"
+                               Placement="Mouse"
+                               PlacementTarget="{Binding ElementName=PART_TextBox}"
+                               StaysOpen="False"
+                               />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2" />
+                            <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2"/>
                             <Setter TargetName="AccentBorder" Property="BorderBrush">
                                 <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
+                                    <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}"/>
                                 </Setter.Value>
                             </Setter>
                             <Setter TargetName="ContentBorder" Property="Background">
                                 <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource ControlFillColorInputActive}" />
+                                    <SolidColorBrush Color="{DynamicResource ControlFillColorInputActive}"/>
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsKeyboardFocusWithin" Value="False" />
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsKeyboardFocusWithin" Value="False"/>
                             </MultiTrigger.Conditions>
                             <Setter TargetName="ContentBorder" Property="Background">
                                 <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource ControlFillColorSecondary}" />
+                                    <SolidColorBrush Color="{DynamicResource ControlFillColorSecondary}"/>
                                 </Setter.Value>
                             </Setter>
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="True">
-                            <Setter Property="Cursor" Value="IBeam" />
+                            <Setter Property="Cursor" Value="IBeam"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}"/>
+                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -217,7 +225,11 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultDatePickerTextBoxStyle}" TargetType="{x:Type DatePickerTextBox}" />
-    <Style BasedOn="{StaticResource DefaultDatePickerStyle}" TargetType="{x:Type DatePicker}" />
+    <Style BasedOn="{StaticResource DefaultDatePickerTextBoxStyle}"
+           TargetType="{x:Type DatePickerTextBox}"
+           />
+    <Style BasedOn="{StaticResource DefaultDatePickerStyle}"
+           TargetType="{x:Type DatePicker}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/DropDownButton/DropDownButton.xaml b/src/Wpf.Ui/Controls/DropDownButton/DropDownButton.xaml
index 45bd8e73e..435409f0e 100644
--- a/src/Wpf.Ui/Controls/DropDownButton/DropDownButton.xaml
+++ b/src/Wpf.Ui/Controls/DropDownButton/DropDownButton.xaml
@@ -8,69 +8,75 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:markup="clr-namespace:Wpf.Ui.Markup">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:markup="clr-namespace:Wpf.Ui.Markup"
+                    >
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Button/Button.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Button/Button.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Thickness x:Key="ButtonChevronIconMargin">8,0,0,0</Thickness>
 
-    <Style
-        x:Key="DefaultUiDropDownButtonStyle"
-        BasedOn="{StaticResource DefaultUiButtonStyle}"
-        TargetType="{x:Type controls:DropDownButton}">
-        <Setter Property="IsDropDownOpen" Value="False" />
+    <Style x:Key="DefaultUiDropDownButtonStyle"
+           BasedOn="{StaticResource DefaultUiButtonStyle}"
+           TargetType="{x:Type controls:DropDownButton}"
+           >
+        <Setter Property="IsDropDownOpen" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:DropDownButton}">
-                    <Border
-                        x:Name="ContentBorder"
-                        Grid.Row="0"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        MinWidth="{TemplateBinding MinWidth}"
-                        MinHeight="{TemplateBinding MinHeight}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="{TemplateBinding Background}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
-                        <Border
-                            Padding="{TemplateBinding Padding}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}">
-                            <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <Border x:Name="ContentBorder"
+                            Grid.Row="0"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            >
+                        <Border Padding="{TemplateBinding Padding}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                >
+                            <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  >
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
 
-                                <ContentPresenter
-                                    x:Name="ControlIcon"
-                                    Grid.Column="0"
-                                    Margin="{StaticResource ButtonIconMargin}"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Icon}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    Focusable="False"
-                                    TextElement.FontSize="{TemplateBinding FontSize}"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                                <ContentPresenter x:Name="ControlIcon"
+                                                  Grid.Column="0"
+                                                  Margin="{StaticResource ButtonIconMargin}"
+                                                  VerticalAlignment="Center"
+                                                  Content="{TemplateBinding Icon}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  Focusable="False"
+                                                  TextElement.FontSize="{TemplateBinding FontSize}"
+                                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                                  />
 
-                                <ContentPresenter
-                                    x:Name="ContentPresenter"
-                                    Grid.Column="1"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Content}"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                                <ContentPresenter x:Name="ContentPresenter"
+                                                  Grid.Column="1"
+                                                  VerticalAlignment="Center"
+                                                  Content="{TemplateBinding Content}"
+                                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                                  />
 
-                                <Grid Grid.Column="2" Margin="{StaticResource ButtonChevronIconMargin}">
-                                    <controls:SymbolIcon FontSize="10" Symbol="ChevronDown24" />
+                                <Grid Grid.Column="2"
+                                      Margin="{StaticResource ButtonChevronIconMargin}"
+                                      >
+                                    <controls:SymbolIcon FontSize="10"
+                                                         Symbol="ChevronDown24"
+                                                         />
                                 </Grid>
                             </Grid>
                         </Border>
@@ -78,36 +84,36 @@
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsPressed" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsPressed" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsPressed" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsPressed" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{Binding PressedBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{Binding PressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding PressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Setter TargetName="ControlIcon" Property="TextElement.Foreground" Value="{Binding PressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{Binding PressedBackground, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{Binding PressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding PressedForeground, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="ControlIcon" Property="TextElement.Foreground" Value="{Binding PressedForeground, RelativeSource={RelativeSource TemplatedParent}}"/>
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextFillColorDisabledBrush}"/>
                         </Trigger>
                         <Trigger Property="Content" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Content" Value="">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
-                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
+                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -115,6 +121,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiDropDownButtonStyle}" TargetType="{x:Type controls:DropDownButton}" />
+    <Style BasedOn="{StaticResource DefaultUiDropDownButtonStyle}"
+           TargetType="{x:Type controls:DropDownButton}"
+           />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/DynamicScrollBar/DynamicScrollBar.xaml b/src/Wpf.Ui/Controls/DynamicScrollBar/DynamicScrollBar.xaml
index 480ce0ee9..7d81ee15c 100644
--- a/src/Wpf.Ui/Controls/DynamicScrollBar/DynamicScrollBar.xaml
+++ b/src/Wpf.Ui/Controls/DynamicScrollBar/DynamicScrollBar.xaml
@@ -1,8 +1,8 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    >
 
     <Duration x:Key="DynamicScrollAnimationDuration">0:0:0.16</Duration>
     <Duration x:Key="DynamicButtonHoverAnimationDuration">0:0:0.16</Duration>
@@ -10,57 +10,59 @@
     <sys:Double x:Key="DynamicLineButtonHeight">12</sys:Double>
     <sys:Double x:Key="DynamicLineButtonWidth">12</sys:Double>
 
-    <Style x:Key="DynamicScrollBarLineButton" TargetType="{x:Type RepeatButton}">
-        <Setter Property="Foreground" Value="{DynamicResource ScrollBarButtonArrowForeground}" />
-        <Setter Property="Width" Value="{StaticResource DynamicLineButtonWidth}" />
-        <Setter Property="Height" Value="{StaticResource DynamicLineButtonHeight}" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="FontSize" Value="11" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Focusable" Value="False" />
+    <Style x:Key="DynamicScrollBarLineButton"
+           TargetType="{x:Type RepeatButton}"
+           >
+        <Setter Property="Foreground" Value="{DynamicResource ScrollBarButtonArrowForeground}"/>
+        <Setter Property="Width" Value="{StaticResource DynamicLineButtonWidth}"/>
+        <Setter Property="Height" Value="{StaticResource DynamicLineButtonHeight}"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="FontSize" Value="11"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Border
-                        x:Name="Border"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        Margin="{TemplateBinding Margin}"
-                        Background="{DynamicResource ScrollBarButtonBackground}"
-                        CornerRadius="6">
-                        <controls:SymbolIcon
-                            Margin="0,0,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Filled="True"
-                            FontSize="{TemplateBinding FontSize}"
-                            Foreground="{TemplateBinding Foreground}"
-                            Symbol="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                    <Border x:Name="Border"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            Margin="{TemplateBinding Margin}"
+                            Background="{DynamicResource ScrollBarButtonBackground}"
+                            CornerRadius="6"
+                            >
+                        <controls:SymbolIcon Margin="0,0,0,0"
+                                             HorizontalAlignment="Center"
+                                             VerticalAlignment="Center"
+                                             Filled="True"
+                                             FontSize="{TemplateBinding FontSize}"
+                                             Foreground="{TemplateBinding Foreground}"
+                                             Symbol="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                             />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="Border"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="0.0"
-                                            To="1.0"
-                                            Duration="{StaticResource DynamicButtonHoverAnimationDuration}" />
+                                        <DoubleAnimation Storyboard.TargetName="Border"
+                                                         Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
+                                                         From="0.0"
+                                                         To="1.0"
+                                                         Duration="{StaticResource DynamicButtonHoverAnimationDuration}"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="Border"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="1.0"
-                                            To="0.0"
-                                            Duration="{StaticResource DynamicButtonHoverAnimationDuration}" />
+                                        <DoubleAnimation Storyboard.TargetName="Border"
+                                                         Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
+                                                         From="1.0"
+                                                         To="0.0"
+                                                         Duration="{StaticResource DynamicButtonHoverAnimationDuration}"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
@@ -71,151 +73,161 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DynamicScrollBarPageButton" TargetType="{x:Type RepeatButton}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Focusable" Value="False" />
+    <Style x:Key="DynamicScrollBarPageButton"
+           TargetType="{x:Type RepeatButton}"
+           >
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Border Background="Transparent" />
+                    <Border Background="Transparent"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="DynamicScrollBarThumb" TargetType="{x:Type Thumb}">
-        <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFill}" />
-        <Setter Property="Border.CornerRadius" Value="4" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Focusable" Value="False" />
+    <Style x:Key="DynamicScrollBarThumb"
+           TargetType="{x:Type Thumb}"
+           >
+        <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFill}"/>
+        <Setter Property="Border.CornerRadius" Value="4"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="1"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}" />
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                            />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="DynamicVerticalScrollBar" TargetType="{x:Type controls:DynamicScrollBar}">
+    <ControlTemplate x:Key="DynamicVerticalScrollBar"
+                     TargetType="{x:Type controls:DynamicScrollBar}"
+                     >
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition MaxHeight="14" />
-                <RowDefinition Height="0.00001*" />
-                <RowDefinition MaxHeight="14" />
+                <RowDefinition MaxHeight="14"/>
+                <RowDefinition Height="0.00001*"/>
+                <RowDefinition MaxHeight="14"/>
             </Grid.RowDefinitions>
-            <Border
-                x:Name="PART_Border"
-                Grid.RowSpan="3"
-                Width="12"
-                HorizontalAlignment="Center"
-                Background="{DynamicResource ScrollBarTrackFillPointerOver}"
-                CornerRadius="6"
-                Opacity="0" />
-            <RepeatButton
-                x:Name="PART_ButtonScrollUp"
-                Grid.Row="0"
-                Command="ScrollBar.LineUpCommand"
-                Content="{x:Static controls:SymbolRegular.CaretUp24}"
-                Opacity="0"
-                Style="{StaticResource DynamicScrollBarLineButton}" />
-            <Track
-                x:Name="PART_Track"
-                Grid.Row="1"
-                Width="6"
-                IsDirectionReversed="True"
-                Opacity="0">
+            <Border x:Name="PART_Border"
+                    Grid.RowSpan="3"
+                    Width="12"
+                    HorizontalAlignment="Center"
+                    Background="{DynamicResource ScrollBarTrackFillPointerOver}"
+                    CornerRadius="6"
+                    Opacity="0"
+                    />
+            <RepeatButton x:Name="PART_ButtonScrollUp"
+                          Grid.Row="0"
+                          Command="ScrollBar.LineUpCommand"
+                          Content="{x:Static controls:SymbolRegular.CaretUp24}"
+                          Opacity="0"
+                          Style="{StaticResource DynamicScrollBarLineButton}"
+                          />
+            <Track x:Name="PART_Track"
+                   Grid.Row="1"
+                   Width="6"
+                   IsDirectionReversed="True"
+                   Opacity="0"
+                   >
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageUpCommand" Style="{StaticResource DynamicScrollBarPageButton}" />
+                    <RepeatButton Command="ScrollBar.PageUpCommand"
+                                  Style="{StaticResource DynamicScrollBarPageButton}"
+                                  />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
                     <!--
                         TODO: Need to add a custom Thumb with a corner radius that will increase when OnMouseOver is triggered.
                     -->
-                    <Thumb
-                        Margin="0"
-                        Padding="0"
-                        Style="{StaticResource DynamicScrollBarThumb}" />
+                    <Thumb Margin="0"
+                           Padding="0"
+                           Style="{StaticResource DynamicScrollBarThumb}"
+                           />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageDownCommand" Style="{StaticResource DynamicScrollBarPageButton}" />
+                    <RepeatButton Command="ScrollBar.PageDownCommand"
+                                  Style="{StaticResource DynamicScrollBarPageButton}"
+                                  />
                 </Track.IncreaseRepeatButton>
             </Track>
-            <RepeatButton
-                x:Name="PART_ButtonScrollDown"
-                Grid.Row="2"
-                Command="ScrollBar.LineDownCommand"
-                Content="{x:Static controls:SymbolRegular.CaretDown24}"
-                Opacity="0"
-                Style="{StaticResource DynamicScrollBarLineButton}" />
+            <RepeatButton x:Name="PART_ButtonScrollDown"
+                          Grid.Row="2"
+                          Command="ScrollBar.LineDownCommand"
+                          Content="{x:Static controls:SymbolRegular.CaretDown24}"
+                          Opacity="0"
+                          Style="{StaticResource DynamicScrollBarLineButton}"
+                          />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Track"
-                                Storyboard.TargetProperty="Width"
-                                From="6"
-                                To="8"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Border"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollUp"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollDown"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Track"
+                                             Storyboard.TargetProperty="Width"
+                                             From="6"
+                                             To="8"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_Border"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollUp"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollDown"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Track"
-                                Storyboard.TargetProperty="Width"
-                                From="8"
-                                To="6"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Border"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollUp"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollDown"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Track"
+                                             Storyboard.TargetProperty="Width"
+                                             From="8"
+                                             To="6"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_Border"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollUp"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollDown"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.ExitActions>
@@ -224,24 +236,24 @@
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Track"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Track"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Track"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Track"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.ExitActions>
@@ -249,59 +261,65 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="DynamicHorizontalScrollBar" TargetType="{x:Type controls:DynamicScrollBar}">
+    <ControlTemplate x:Key="DynamicHorizontalScrollBar"
+                     TargetType="{x:Type controls:DynamicScrollBar}"
+                     >
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition MaxWidth="18" />
-                <ColumnDefinition Width="0.00001*" />
-                <ColumnDefinition MaxWidth="18" />
+                <ColumnDefinition MaxWidth="18"/>
+                <ColumnDefinition Width="0.00001*"/>
+                <ColumnDefinition MaxWidth="18"/>
             </Grid.ColumnDefinitions>
-            <Border
-                x:Name="PART_Border"
-                Grid.ColumnSpan="3"
-                Height="12"
-                VerticalAlignment="Center"
-                Background="{DynamicResource ScrollBarButtonBackground}"
-                CornerRadius="6"
-                Opacity="0" />
+            <Border x:Name="PART_Border"
+                    Grid.ColumnSpan="3"
+                    Height="12"
+                    VerticalAlignment="Center"
+                    Background="{DynamicResource ScrollBarButtonBackground}"
+                    CornerRadius="6"
+                    Opacity="0"
+                    />
 
-            <RepeatButton
-                x:Name="PART_ButtonScrollLeft"
-                Grid.Column="0"
-                VerticalAlignment="Center"
-                Command="ScrollBar.LineLeftCommand"
-                Content="{x:Static controls:SymbolRegular.CaretLeft24}"
-                Opacity="0"
-                Style="{StaticResource DynamicScrollBarLineButton}" />
+            <RepeatButton x:Name="PART_ButtonScrollLeft"
+                          Grid.Column="0"
+                          VerticalAlignment="Center"
+                          Command="ScrollBar.LineLeftCommand"
+                          Content="{x:Static controls:SymbolRegular.CaretLeft24}"
+                          Opacity="0"
+                          Style="{StaticResource DynamicScrollBarLineButton}"
+                          />
 
-            <Track
-                x:Name="PART_Track"
-                Grid.Column="1"
-                Height="6"
-                VerticalAlignment="Center"
-                IsDirectionReversed="False">
+            <Track x:Name="PART_Track"
+                   Grid.Column="1"
+                   Height="6"
+                   VerticalAlignment="Center"
+                   IsDirectionReversed="False"
+                   >
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageLeftCommand" Style="{StaticResource DynamicScrollBarPageButton}" />
+                    <RepeatButton Command="ScrollBar.PageLeftCommand"
+                                  Style="{StaticResource DynamicScrollBarPageButton}"
+                                  />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Thumb
-                        Margin="0"
-                        Padding="0"
-                        Style="{StaticResource DynamicScrollBarThumb}" />
+                    <Thumb Margin="0"
+                           Padding="0"
+                           Style="{StaticResource DynamicScrollBarThumb}"
+                           />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageRightCommand" Style="{StaticResource DynamicScrollBarPageButton}" />
+                    <RepeatButton Command="ScrollBar.PageRightCommand"
+                                  Style="{StaticResource DynamicScrollBarPageButton}"
+                                  />
                 </Track.IncreaseRepeatButton>
             </Track>
 
-            <RepeatButton
-                x:Name="PART_ButtonScrollRight"
-                Grid.Column="2"
-                VerticalAlignment="Center"
-                Command="ScrollBar.LineRightCommand"
-                Content="{x:Static controls:SymbolRegular.CaretRight24}"
-                Opacity="0"
-                Style="{StaticResource DynamicScrollBarLineButton}" />
+            <RepeatButton x:Name="PART_ButtonScrollRight"
+                          Grid.Column="2"
+                          VerticalAlignment="Center"
+                          Command="ScrollBar.LineRightCommand"
+                          Content="{x:Static controls:SymbolRegular.CaretRight24}"
+                          Opacity="0"
+                          Style="{StaticResource DynamicScrollBarLineButton}"
+                          />
 
         </Grid>
         <ControlTemplate.Triggers>
@@ -309,60 +327,60 @@
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Track"
-                                Storyboard.TargetProperty="Height"
-                                From="6"
-                                To="8"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Border"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollLeft"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollRight"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Track"
+                                             Storyboard.TargetProperty="Height"
+                                             From="6"
+                                             To="8"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_Border"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollLeft"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollRight"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Track"
-                                Storyboard.TargetProperty="Height"
-                                From="8"
-                                To="6"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Border"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollLeft"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollRight"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Track"
+                                             Storyboard.TargetProperty="Height"
+                                             From="8"
+                                             To="6"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_Border"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollLeft"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollRight"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.ExitActions>
@@ -371,24 +389,24 @@
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Track"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Track"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Track"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource DynamicScrollAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Track"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource DynamicScrollAnimationDuration}"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.ExitActions>
@@ -396,26 +414,30 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="UiDynamicScrollBar" TargetType="{x:Type controls:DynamicScrollBar}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="UiDynamicScrollBar"
+           TargetType="{x:Type controls:DynamicScrollBar}"
+           >
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Horizontal">
-                <Setter Property="Width" Value="Auto" />
-                <Setter Property="Height" Value="14" />
-                <Setter Property="Template" Value="{StaticResource DynamicHorizontalScrollBar}" />
+                <Setter Property="Width" Value="Auto"/>
+                <Setter Property="Height" Value="14"/>
+                <Setter Property="Template" Value="{StaticResource DynamicHorizontalScrollBar}"/>
             </Trigger>
             <Trigger Property="Orientation" Value="Vertical">
-                <Setter Property="Width" Value="14" />
-                <Setter Property="Height" Value="Auto" />
-                <Setter Property="Template" Value="{StaticResource DynamicVerticalScrollBar}" />
+                <Setter Property="Width" Value="14"/>
+                <Setter Property="Height" Value="Auto"/>
+                <Setter Property="Template" Value="{StaticResource DynamicVerticalScrollBar}"/>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource UiDynamicScrollBar}" TargetType="{x:Type controls:DynamicScrollBar}" />
+    <Style BasedOn="{StaticResource UiDynamicScrollBar}"
+           TargetType="{x:Type controls:DynamicScrollBar}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/DynamicScrollViewer/DynamicScrollViewer.xaml b/src/Wpf.Ui/Controls/DynamicScrollViewer/DynamicScrollViewer.xaml
index 91c377518..9433e869b 100644
--- a/src/Wpf.Ui/Controls/DynamicScrollViewer/DynamicScrollViewer.xaml
+++ b/src/Wpf.Ui/Controls/DynamicScrollViewer/DynamicScrollViewer.xaml
@@ -5,67 +5,71 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style x:Key="UiDynamicScrollViewer" TargetType="{x:Type controls:DynamicScrollViewer}">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="UiDynamicScrollViewer"
+           TargetType="{x:Type controls:DynamicScrollViewer}"
+           >
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:DynamicScrollViewer}">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
 
 
-                        <Border
-                            Grid.Row="0"
-                            Grid.RowSpan="2"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Padding="{TemplateBinding Padding}">
-                            <ScrollContentPresenter CanContentScroll="{TemplateBinding CanContentScroll}" />
+                        <Border Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="2"
+                                Padding="{TemplateBinding Padding}"
+                                >
+                            <ScrollContentPresenter CanContentScroll="{TemplateBinding CanContentScroll}"/>
                         </Border>
 
-                        <controls:DynamicScrollBar
-                            x:Name="PART_VerticalScrollBar"
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            IsScrolling="{TemplateBinding IsScrollingVertically}"
-                            Maximum="{TemplateBinding ScrollableHeight}"
-                            ViewportSize="{TemplateBinding ViewportHeight}"
-                            Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
-                            Value="{TemplateBinding VerticalOffset}" />
+                        <controls:DynamicScrollBar x:Name="PART_VerticalScrollBar"
+                                                   Grid.Row="0"
+                                                   Grid.Column="1"
+                                                   IsScrolling="{TemplateBinding IsScrollingVertically}"
+                                                   Maximum="{TemplateBinding ScrollableHeight}"
+                                                   ViewportSize="{TemplateBinding ViewportHeight}"
+                                                   Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
+                                                   Value="{TemplateBinding VerticalOffset}"
+                                                   />
 
-                        <controls:DynamicScrollBar
-                            x:Name="PART_HorizontalScrollBar"
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            IsScrolling="{TemplateBinding IsScrollingHorizontally}"
-                            Maximum="{TemplateBinding ScrollableWidth}"
-                            Orientation="Horizontal"
-                            ViewportSize="{TemplateBinding ViewportWidth}"
-                            Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
-                            Value="{TemplateBinding HorizontalOffset}" />
+                        <controls:DynamicScrollBar x:Name="PART_HorizontalScrollBar"
+                                                   Grid.Row="1"
+                                                   Grid.Column="0"
+                                                   IsScrolling="{TemplateBinding IsScrollingHorizontally}"
+                                                   Maximum="{TemplateBinding ScrollableWidth}"
+                                                   Orientation="Horizontal"
+                                                   ViewportSize="{TemplateBinding ViewportWidth}"
+                                                   Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
+                                                   Value="{TemplateBinding HorizontalOffset}"
+                                                   />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource UiDynamicScrollViewer}" TargetType="{x:Type controls:DynamicScrollViewer}" />
+    <Style BasedOn="{StaticResource UiDynamicScrollViewer}"
+           TargetType="{x:Type controls:DynamicScrollViewer}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/Expander/Expander.xaml b/src/Wpf.Ui/Controls/Expander/Expander.xaml
index 3831f9fde..4e6110669 100644
--- a/src/Wpf.Ui/Controls/Expander/Expander.xaml
+++ b/src/Wpf.Ui/Controls/Expander/Expander.xaml
@@ -8,45 +8,49 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                    >
 
     <Thickness x:Key="ExpanderPadding">11,11,11,11</Thickness>
     <Thickness x:Key="ExpanderBorderThemeThickness">1</Thickness>
     <system:Double x:Key="ExpanderChevronSize">16.0</system:Double>
 
-    <ControlTemplate x:Key="DefaultExpanderToggleButtonStyle" TargetType="{x:Type ToggleButton}">
-        <Grid Margin="{TemplateBinding Padding}" Background="Transparent">
+    <ControlTemplate x:Key="DefaultExpanderToggleButtonStyle"
+                     TargetType="{x:Type ToggleButton}"
+                     >
+        <Grid Margin="{TemplateBinding Padding}"
+              Background="Transparent"
+              >
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <ContentPresenter
-                x:Name="ContentPresenter"
-                Grid.Column="0"
-                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                Content="{TemplateBinding Content}"
-                TextElement.FontSize="{TemplateBinding FontSize}" />
-            <Grid
-                x:Name="ChevronGrid"
-                Grid.Column="1"
-                Margin="0"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                RenderTransformOrigin="0.5, 0.5">
+            <ContentPresenter x:Name="ContentPresenter"
+                              Grid.Column="0"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Content}"
+                              TextElement.FontSize="{TemplateBinding FontSize}"
+                              />
+            <Grid x:Name="ChevronGrid"
+                  Grid.Column="1"
+                  Margin="0"
+                  VerticalAlignment="Center"
+                  Background="Transparent"
+                  RenderTransformOrigin="0.5, 0.5"
+                  >
                 <Grid.RenderTransform>
-                    <RotateTransform Angle="0" />
+                    <RotateTransform Angle="0"/>
                 </Grid.RenderTransform>
-                <controls:SymbolIcon
-                    x:Name="ControlChevronIcon"
-                    FontSize="{StaticResource ExpanderChevronSize}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Symbol="ChevronDown24" />
+                <controls:SymbolIcon x:Name="ControlChevronIcon"
+                                     FontSize="{StaticResource ExpanderChevronSize}"
+                                     Foreground="{TemplateBinding Foreground}"
+                                     Symbol="ChevronDown24"
+                                     />
             </Grid>
         </Grid>
         <ControlTemplate.Triggers>
@@ -54,22 +58,22 @@
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="ChevronGrid"
-                                Storyboard.TargetProperty="(Grid.RenderTransform).(RotateTransform.Angle)"
-                                To="180"
-                                Duration="00:00:00.167" />
+                            <DoubleAnimation Storyboard.TargetName="ChevronGrid"
+                                             Storyboard.TargetProperty="(Grid.RenderTransform).(RotateTransform.Angle)"
+                                             To="180"
+                                             Duration="00:00:00.167"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="ChevronGrid"
-                                Storyboard.TargetProperty="(Grid.RenderTransform).(RotateTransform.Angle)"
-                                To="0"
-                                Duration="00:00:00.167" />
+                            <DoubleAnimation Storyboard.TargetName="ChevronGrid"
+                                             Storyboard.TargetProperty="(Grid.RenderTransform).(RotateTransform.Angle)"
+                                             To="0"
+                                             Duration="00:00:00.167"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.ExitActions>
@@ -77,87 +81,97 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="DefaultExpanderStyle" TargetType="{x:Type Expander}">
+    <Style x:Key="DefaultExpanderStyle"
+           TargetType="{x:Type Expander}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Background" Value="{DynamicResource ExpanderHeaderBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource ExpanderBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource ExpanderPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="IsExpanded" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource ExpanderHeaderBackground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderForeground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource ExpanderBorderThemeThickness}"/>
+        <Setter Property="Padding" Value="{StaticResource ExpanderPadding}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="IsExpanded" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Expander}">
                     <ControlTemplate.Resources>
-                        <converters:AnimationFactorToValueConverter x:Key="AnimationFactorToValueConverter" />
+                        <converters:AnimationFactorToValueConverter x:Key="AnimationFactorToValueConverter"/>
                     </ControlTemplate.Resources>
 
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
 
                         <!--  Top level controls always visible  -->
-                        <Border
-                            x:Name="ToggleButtonBorder"
-                            Grid.Row="0"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="1"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}">
-                            <ToggleButton
-                                x:Name="ExpanderToggleButton"
-                                Margin="0"
-                                Padding="{TemplateBinding Padding}"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                HorizontalContentAlignment="Stretch"
-                                VerticalContentAlignment="Center"
-                                Content="{TemplateBinding Header}"
-                                FontSize="{TemplateBinding FontSize}"
-                                Foreground="{TemplateBinding Foreground}"
-                                IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                IsEnabled="{TemplateBinding IsEnabled}"
-                                OverridesDefaultStyle="True"
-                                Template="{StaticResource DefaultExpanderToggleButtonStyle}" />
+                        <Border x:Name="ToggleButtonBorder"
+                                Grid.Row="0"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                >
+                            <ToggleButton x:Name="ExpanderToggleButton"
+                                          Margin="0"
+                                          Padding="{TemplateBinding Padding}"
+                                          HorizontalAlignment="Stretch"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalContentAlignment="Stretch"
+                                          VerticalContentAlignment="Center"
+                                          Content="{TemplateBinding Header}"
+                                          FontSize="{TemplateBinding FontSize}"
+                                          Foreground="{TemplateBinding Foreground}"
+                                          IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                          IsEnabled="{TemplateBinding IsEnabled}"
+                                          OverridesDefaultStyle="True"
+                                          Template="{StaticResource DefaultExpanderToggleButtonStyle}"
+                                          />
                         </Border>
 
                         <!--  Collapsed content to expand  -->
-                        <Grid Grid.Row="1" ClipToBounds="True">
-                            <Border
-                                x:Name="ContentPresenterBorder"
-                                Background="{DynamicResource ExpanderContentBackground}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="1,0,1,1"
-                                CornerRadius="0,0,4,4"
-                                Visibility="Collapsed">
-                                <ContentPresenter
-                                    x:Name="ContentPresenter"
-                                    Margin="{TemplateBinding Padding}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Content="{TemplateBinding Content}" />
+                        <Grid Grid.Row="1"
+                              ClipToBounds="True"
+                              >
+                            <Border x:Name="ContentPresenterBorder"
+                                    Background="{DynamicResource ExpanderContentBackground}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="1,0,1,1"
+                                    CornerRadius="0,0,4,4"
+                                    Visibility="Collapsed"
+                                    >
+                                <ContentPresenter x:Name="ContentPresenter"
+                                                  Margin="{TemplateBinding Padding}"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  />
                                 <Border.Tag>
                                     <system:Double>0.0</system:Double>
                                 </Border.Tag>
                                 <Border.RenderTransform>
                                     <TranslateTransform>
                                         <TranslateTransform.Y>
-                                            <MultiBinding Converter="{StaticResource AnimationFactorToValueConverter}" ConverterParameter="negative">
-                                                <Binding ElementName="ContentPresenterBorder" Path="ActualHeight" />
-                                                <Binding ElementName="ContentPresenterBorder" Path="Tag" />
+                                            <MultiBinding Converter="{StaticResource AnimationFactorToValueConverter}"
+                                                          ConverterParameter="negative"
+                                                          >
+                                                <Binding ElementName="ContentPresenterBorder"
+                                                         Path="ActualHeight"
+                                                         />
+                                                <Binding ElementName="ContentPresenterBorder"
+                                                         Path="Tag"
+                                                         />
                                             </MultiBinding>
                                         </TranslateTransform.Y>
                                     </TranslateTransform>
@@ -168,19 +182,27 @@
 
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsExpanded" Value="True">
-                            <Setter TargetName="ToggleButtonBorder" Property="CornerRadius" Value="4,4,0,0" />
+                            <Setter TargetName="ToggleButtonBorder" Property="CornerRadius" Value="4,4,0,0"/>
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder" Storyboard.TargetProperty="(Border.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder"
+                                                                       Storyboard.TargetProperty="(Border.Visibility)"
+                                                                       >
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{x:Static Visibility.Visible}"
+                                                                    />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder" Storyboard.TargetProperty="Tag">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="1.0" />
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="0.0, 0.0, 0.0, 1.0"
-                                                KeyTime="0:0:0.333"
-                                                Value="0.0" />
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder"
+                                                                       Storyboard.TargetProperty="Tag"
+                                                                       >
+                                            <DiscreteDoubleKeyFrame KeyTime="0"
+                                                                    Value="1.0"
+                                                                    />
+                                            <SplineDoubleKeyFrame KeySpline="0.0, 0.0, 0.0, 1.0"
+                                                                  KeyTime="0:0:0.333"
+                                                                  Value="0.0"
+                                                                  />
                                         </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </BeginStoryboard>
@@ -188,28 +210,38 @@
                             <Trigger.ExitActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder" Storyboard.TargetProperty="(Border.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
-                                            <DiscreteObjectKeyFrame KeyTime="0:0:0.2" Value="{x:Static Visibility.Collapsed}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder"
+                                                                       Storyboard.TargetProperty="(Border.Visibility)"
+                                                                       >
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{x:Static Visibility.Visible}"
+                                                                    />
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0.2"
+                                                                    Value="{x:Static Visibility.Collapsed}"
+                                                                    />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder" Storyboard.TargetProperty="Tag">
-                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0.0" />
-                                            <SplineDoubleKeyFrame
-                                                KeySpline="1.0, 1.0, 0.0, 1.0"
-                                                KeyTime="0:0:0.167"
-                                                Value="1.0" />
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenterBorder"
+                                                                       Storyboard.TargetProperty="Tag"
+                                                                       >
+                                            <DiscreteDoubleKeyFrame KeyTime="0"
+                                                                    Value="0.0"
+                                                                    />
+                                            <SplineDoubleKeyFrame KeySpline="1.0, 1.0, 0.0, 1.0"
+                                                                  KeyTime="0:0:0.167"
+                                                                  Value="1.0"
+                                                                  />
                                         </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
-                            <Setter TargetName="ExpanderToggleButton" Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
-                            <Setter TargetName="ExpanderToggleButton" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderDisabledBorderBrush}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}"/>
+                            <Setter TargetName="ExpanderToggleButton" Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}"/>
+                            <Setter TargetName="ExpanderToggleButton" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderDisabledBorderBrush}"/>
                         </Trigger>
                         <Trigger SourceName="ExpanderToggleButton" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="ExpanderToggleButton" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderPointerOverBrush}" />
+                            <Setter TargetName="ExpanderToggleButton" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderPointerOverBrush}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -217,6 +249,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultExpanderStyle}" TargetType="{x:Type Expander}" />
+    <Style BasedOn="{StaticResource DefaultExpanderStyle}"
+           TargetType="{x:Type Expander}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/FluentWindow/FluentWindow.xaml b/src/Wpf.Ui/Controls/FluentWindow/FluentWindow.xaml
index b26c962e8..b7e016eaf 100644
--- a/src/Wpf.Ui/Controls/FluentWindow/FluentWindow.xaml
+++ b/src/Wpf.Ui/Controls/FluentWindow/FluentWindow.xaml
@@ -5,39 +5,39 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style
-        x:Key="DefaultFluentWindowStyle"
-        BasedOn="{StaticResource {x:Type Window}}"
-        TargetType="{x:Type controls:FluentWindow}">
-        <Setter Property="Background" Value="{DynamicResource WindowBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource WindowForeground}" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Height" Value="600" />
-        <Setter Property="MinHeight" Value="320" />
-        <Setter Property="Width" Value="1100" />
-        <Setter Property="MinWidth" Value="460" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="UseLayoutRounding" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultFluentWindowStyle"
+           BasedOn="{StaticResource {x:Type Window}}"
+           TargetType="{x:Type controls:FluentWindow}"
+           >
+        <Setter Property="Background" Value="{DynamicResource WindowBackground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource WindowForeground}"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Height" Value="600"/>
+        <Setter Property="MinHeight" Value="320"/>
+        <Setter Property="Width" Value="1100"/>
+        <Setter Property="MinWidth" Value="460"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Window}">
                     <AdornerDecorator>
-                        <controls:ClientAreaBorder
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                            <ContentPresenter x:Name="ContentPresenter" />
+                        <controls:ClientAreaBorder Background="{TemplateBinding Background}"
+                                                   BorderBrush="{TemplateBinding BorderBrush}"
+                                                   BorderThickness="{TemplateBinding BorderThickness}"
+                                                   >
+                            <ContentPresenter x:Name="ContentPresenter"/>
                         </controls:ClientAreaBorder>
                     </AdornerDecorator>
                 </ControlTemplate>
@@ -45,6 +45,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultFluentWindowStyle}" TargetType="{x:Type controls:FluentWindow}" />
+    <Style BasedOn="{StaticResource DefaultFluentWindowStyle}"
+           TargetType="{x:Type controls:FluentWindow}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/Flyout/Flyout.xaml b/src/Wpf.Ui/Controls/Flyout/Flyout.xaml
index 38517407d..ea6e79f7d 100644
--- a/src/Wpf.Ui/Controls/Flyout/Flyout.xaml
+++ b/src/Wpf.Ui/Controls/Flyout/Flyout.xaml
@@ -8,60 +8,62 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style x:Key="DefaultFlyoutStyle" TargetType="{x:Type controls:Flyout}">
-        <Setter Property="Background" Value="{DynamicResource FlyoutBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource FlyoutBorderBrush}" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="MinWidth" Value="20" />
-        <Setter Property="MinHeight" Value="20" />
-        <Setter Property="Padding" Value="12" />
-        <Setter Property="VerticalAlignment" Value="Bottom" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="Placement" Value="Top" />
-        <Setter Property="Popup.AllowsTransparency" Value="True" />
-        <Setter Property="Popup.StaysOpen" Value="False" />
-        <Setter Property="Popup.PopupAnimation" Value="Fade" />
-        <Setter Property="Popup.VerticalOffset" Value="1" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultFlyoutStyle"
+           TargetType="{x:Type controls:Flyout}"
+           >
+        <Setter Property="Background" Value="{DynamicResource FlyoutBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource FlyoutBorderBrush}"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="MinWidth" Value="20"/>
+        <Setter Property="MinHeight" Value="20"/>
+        <Setter Property="Padding" Value="12"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="Placement" Value="Top"/>
+        <Setter Property="Popup.AllowsTransparency" Value="True"/>
+        <Setter Property="Popup.StaysOpen" Value="False"/>
+        <Setter Property="Popup.PopupAnimation" Value="Fade"/>
+        <Setter Property="Popup.VerticalOffset" Value="1"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:Flyout}">
                     <Grid>
-                        <Popup
-                            x:Name="PART_Popup"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                            AllowsTransparency="{TemplateBinding Popup.AllowsTransparency}"
-                            Focusable="False"
-                            IsOpen="{TemplateBinding IsOpen}"
-                            Placement="{TemplateBinding Placement}"
-                            PopupAnimation="{TemplateBinding Popup.PopupAnimation}"
-                            StaysOpen="{TemplateBinding Popup.StaysOpen}"
-                            VerticalOffset="1">
-                            <Border
-                                x:Name="PopupBorder"
-                                Margin="{TemplateBinding Margin}"
-                                Padding="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="{DynamicResource PopupCornerRadius}"
-                                SnapsToDevicePixels="True">
-                                <ContentPresenter Content="{TemplateBinding Content}" />
+                        <Popup x:Name="PART_Popup"
+                               MinWidth="{TemplateBinding MinWidth}"
+                               MinHeight="{TemplateBinding MinHeight}"
+                               HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                               VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                               AllowsTransparency="{TemplateBinding Popup.AllowsTransparency}"
+                               Focusable="False"
+                               IsOpen="{TemplateBinding IsOpen}"
+                               Placement="{TemplateBinding Placement}"
+                               PopupAnimation="{TemplateBinding Popup.PopupAnimation}"
+                               StaysOpen="{TemplateBinding Popup.StaysOpen}"
+                               VerticalOffset="1"
+                               >
+                            <Border x:Name="PopupBorder"
+                                    Margin="{TemplateBinding Margin}"
+                                    Padding="{TemplateBinding Padding}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="{DynamicResource PopupCornerRadius}"
+                                    SnapsToDevicePixels="True"
+                                    >
+                                <ContentPresenter Content="{TemplateBinding Content}"/>
                             </Border>
                         </Popup>
                     </Grid>
@@ -70,6 +72,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultFlyoutStyle}" TargetType="{x:Type controls:Flyout}" />
+    <Style BasedOn="{StaticResource DefaultFlyoutStyle}"
+           TargetType="{x:Type controls:Flyout}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/Frame/Frame.xaml b/src/Wpf.Ui/Controls/Frame/Frame.xaml
index d14a72991..cd0bd2b62 100644
--- a/src/Wpf.Ui/Controls/Frame/Frame.xaml
+++ b/src/Wpf.Ui/Controls/Frame/Frame.xaml
@@ -5,15 +5,17 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <Style TargetType="{x:Type Frame}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="NavigationUIVisibility" Value="Hidden" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="NavigationUIVisibility" Value="Hidden"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/GridView/GridViewColumnHeader.xaml b/src/Wpf.Ui/Controls/GridView/GridViewColumnHeader.xaml
index 8881c5acf..84549094d 100644
--- a/src/Wpf.Ui/Controls/GridView/GridViewColumnHeader.xaml
+++ b/src/Wpf.Ui/Controls/GridView/GridViewColumnHeader.xaml
@@ -5,23 +5,25 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style x:Key="UiGridViewColumnHeaderStyle" TargetType="GridViewColumnHeader">
+    <Style x:Key="UiGridViewColumnHeaderStyle"
+           TargetType="GridViewColumnHeader"
+           >
         <Style.Triggers>
             <Trigger Property="GridViewColumnHeader.Role" Value="Floating">
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="GridViewColumnHeader">
                             <Canvas Name="PART_FloatingHeaderCanvas">
-                                <Rectangle
-                                    Width="{TemplateBinding ActualWidth}"
-                                    Height="{TemplateBinding ActualHeight}"
-                                    Fill="#FF000000"
-                                    Opacity="0.5" />
+                                <Rectangle Width="{TemplateBinding ActualWidth}"
+                                           Height="{TemplateBinding ActualHeight}"
+                                           Fill="#FF000000"
+                                           Opacity="0.5"
+                                           />
                             </Canvas>
                         </ControlTemplate>
                     </Setter.Value>
@@ -31,45 +33,47 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="GridViewColumnHeader">
-                            <Border
-                                Name="HeaderBorder"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding Border.BorderBrush}"
-                                BorderThickness="0,0,0,0" />
+                            <Border Name="HeaderBorder"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding Border.BorderBrush}"
+                                    BorderThickness="0,0,0,0"
+                                    />
                         </ControlTemplate>
                     </Setter.Value>
                 </Setter>
             </Trigger>
         </Style.Triggers>
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0,0,0,0" />
-        <Setter Property="Margin" Value="0,0,0,0" />
-        <Setter Property="Padding" Value="0,2" />
-        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
-        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0,0,0,0"/>
+        <Setter Property="Margin" Value="0,0,0,0"/>
+        <Setter Property="Padding" Value="0,2"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+        <Setter Property="FontWeight" Value="Bold"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="GridViewColumnHeader">
                     <Grid>
-                        <Border
-                            Name="HeaderBorder"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="0,0,0,0"
-                            CornerRadius="{DynamicResource ControlCornerRadius}">
-                            <Border Margin="6,0,0,0" Padding="{TemplateBinding Padding}">
-                                <ContentPresenter
-                                    Name="HeaderContent"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Content="{TemplateBinding Content}"
-                                    ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    RecognizesAccessKey="True"
-                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Border Name="HeaderBorder"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="0,0,0,0"
+                                CornerRadius="{DynamicResource ControlCornerRadius}"
+                                >
+                            <Border Margin="6,0,0,0"
+                                    Padding="{TemplateBinding Padding}"
+                                    >
+                                <ContentPresenter Name="HeaderContent"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  RecognizesAccessKey="True"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                  />
                                 <!--<TextBlock Text="{TemplateBinding Content}" />-->
                             </Border>
                         </Border>
@@ -77,19 +81,21 @@
                             <Thumb Name="PART_HeaderGripper">
                                 <Thumb.Style>
                                     <Style TargetType="Thumb">
-                                        <Setter Property="Canvas.Right" Value="-9" />
-                                        <Setter Property="Width" Value="18" />
-                                        <Setter Property="Height" Value="{Binding Path=ActualHeight, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
-                                        <Setter Property="Padding" Value="0,0,0,0" />
-                                        <Setter Property="Background" Value="Transparent" />
+                                        <Setter Property="Canvas.Right" Value="-9"/>
+                                        <Setter Property="Width" Value="18"/>
+                                        <Setter Property="Height" Value="{Binding Path=ActualHeight, RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
+                                        <Setter Property="Padding" Value="0,0,0,0"/>
+                                        <Setter Property="Background" Value="Transparent"/>
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate TargetType="Thumb">
-                                                    <Border Padding="{TemplateBinding Padding}" Background="#00FFFFFF">
-                                                        <Rectangle
-                                                            Width="1"
-                                                            HorizontalAlignment="Center"
-                                                            Fill="{TemplateBinding Background}" />
+                                                    <Border Padding="{TemplateBinding Padding}"
+                                                            Background="#00FFFFFF"
+                                                            >
+                                                        <Rectangle Width="1"
+                                                                   HorizontalAlignment="Center"
+                                                                   Fill="{TemplateBinding Background}"
+                                                                   />
                                                     </Border>
                                                 </ControlTemplate>
                                             </Setter.Value>
@@ -101,15 +107,15 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="HeaderBorder" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
-                            <Setter TargetName="PART_HeaderGripper" Property="Background" Value="Transparent" />
+                            <Setter TargetName="HeaderBorder" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}"/>
+                            <Setter TargetName="PART_HeaderGripper" Property="Background" Value="Transparent"/>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="HeaderBorder" Property="Background" Value="Transparent" />
-                            <Setter TargetName="PART_HeaderGripper" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="HeaderBorder" Property="Background" Value="Transparent"/>
+                            <Setter TargetName="PART_HeaderGripper" Property="Visibility" Value="Hidden"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/HyperlinkButton/HyperlinkButton.xaml b/src/Wpf.Ui/Controls/HyperlinkButton/HyperlinkButton.xaml
index dc255c041..240d3f3c9 100644
--- a/src/Wpf.Ui/Controls/HyperlinkButton/HyperlinkButton.xaml
+++ b/src/Wpf.Ui/Controls/HyperlinkButton/HyperlinkButton.xaml
@@ -8,98 +8,102 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Thickness x:Key="HyperlinkButtonPadding">11,5,11,6</Thickness>
     <Thickness x:Key="HyperlinkButtonBorderThemeThickness">0</Thickness>
     <Thickness x:Key="HyperlinkButtonIconMargin">0,0,8,0</Thickness>
 
-    <Style x:Key="DefaultUiHyperlinkButtonStyle" TargetType="{x:Type controls:HyperlinkButton}">
+    <Style x:Key="DefaultUiHyperlinkButtonStyle"
+           TargetType="{x:Type controls:HyperlinkButton}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForeground}" />
-        <Setter Property="BorderThickness" Value="{StaticResource HyperlinkButtonBorderThemeThickness}" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="Padding" Value="{StaticResource HyperlinkButtonPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="Appearance" Value="Secondary" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForeground}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource HyperlinkButtonBorderThemeThickness}"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Padding" Value="{StaticResource HyperlinkButtonPadding}"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="Appearance" Value="Secondary"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:HyperlinkButton}">
-                    <Border
-                        x:Name="ContentBorder"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        MinWidth="{TemplateBinding MinWidth}"
-                        MinHeight="{TemplateBinding MinHeight}"
-                        Padding="{TemplateBinding Padding}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <Border x:Name="ContentBorder"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            >
+                        <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              >
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
 
-                            <ContentControl
-                                x:Name="ControlIcon"
-                                Grid.Column="0"
-                                Margin="{StaticResource HyperlinkButtonIconMargin}"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding Icon}"
-                                Focusable="False"
-                                Foreground="{TemplateBinding Foreground}" />
+                            <ContentControl x:Name="ControlIcon"
+                                            Grid.Column="0"
+                                            Margin="{StaticResource HyperlinkButtonIconMargin}"
+                                            VerticalAlignment="Center"
+                                            Content="{TemplateBinding Icon}"
+                                            Focusable="False"
+                                            Foreground="{TemplateBinding Foreground}"
+                                            />
 
-                            <ContentPresenter
-                                x:Name="ContentPresenter"
-                                Grid.Column="1"
-                                Content="{TemplateBinding Content}"
-                                TextElement.Foreground="{TemplateBinding Foreground}" />
+                            <ContentPresenter x:Name="ContentPresenter"
+                                              Grid.Column="1"
+                                              Content="{TemplateBinding Content}"
+                                              TextElement.Foreground="{TemplateBinding Foreground}"
+                                              />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsPressed" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsPressed" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundPointerOver}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource HyperlinkButtonForegroundPointerOver}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundPointerOver}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource HyperlinkButtonForegroundPointerOver}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsPressed" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsPressed" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundPressed}" />
-                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource HyperlinkButtonForegroundPressed}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource HyperlinkButtonForegroundPressed}" />
+                            <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundPressed}"/>
+                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource HyperlinkButtonForegroundPressed}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource HyperlinkButtonForegroundPressed}"/>
                         </MultiTrigger>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
-                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
+                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundDisabled}" />
-                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource HyperlinkButtonForegroundDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource HyperlinkButtonForegroundDisabled}" />
+                            <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundDisabled}"/>
+                            <Setter TargetName="ControlIcon" Property="Foreground" Value="{DynamicResource HyperlinkButtonForegroundDisabled}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource HyperlinkButtonForegroundDisabled}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -107,6 +111,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiHyperlinkButtonStyle}" TargetType="{x:Type controls:HyperlinkButton}" />
+    <Style BasedOn="{StaticResource DefaultUiHyperlinkButtonStyle}"
+           TargetType="{x:Type controls:HyperlinkButton}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/Image/Image.xaml b/src/Wpf.Ui/Controls/Image/Image.xaml
index 865ce5e13..06bfb73b9 100644
--- a/src/Wpf.Ui/Controls/Image/Image.xaml
+++ b/src/Wpf.Ui/Controls/Image/Image.xaml
@@ -8,38 +8,40 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style x:Key="DefaultImageStyle" TargetType="{x:Type controls:Image}">
+    <Style x:Key="DefaultImageStyle"
+           TargetType="{x:Type controls:Image}"
+           >
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:Image}">
-                    <Border
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        ClipToBounds="True"
-                        CornerRadius="{TemplateBinding CornerRadius}">
-
-                        <Image
-                            HorizontalAlignment="Center"
+                    <Border HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Source="{TemplateBinding Source}"
-                            Stretch="{TemplateBinding Stretch}"
-                            StretchDirection="{TemplateBinding StretchDirection}">
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            ClipToBounds="True"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            >
+
+                        <Image HorizontalAlignment="Center"
+                               VerticalAlignment="Center"
+                               Source="{TemplateBinding Source}"
+                               Stretch="{TemplateBinding Stretch}"
+                               StretchDirection="{TemplateBinding StretchDirection}"
+                               >
                             <Image.OpacityMask>
                                 <VisualBrush>
                                     <VisualBrush.Visual>
-                                        <Border
-                                            Width="{TemplateBinding ActualWidth}"
-                                            Height="{TemplateBinding ActualHeight}"
-                                            Background="White"
-                                            CornerRadius="{TemplateBinding InnerCornerRadius}" />
+                                        <Border Width="{TemplateBinding ActualWidth}"
+                                                Height="{TemplateBinding ActualHeight}"
+                                                Background="White"
+                                                CornerRadius="{TemplateBinding InnerCornerRadius}"
+                                                />
                                     </VisualBrush.Visual>
                                 </VisualBrush>
                             </Image.OpacityMask>
@@ -50,6 +52,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultImageStyle}" TargetType="{x:Type controls:Image}" />
+    <Style BasedOn="{StaticResource DefaultImageStyle}"
+           TargetType="{x:Type controls:Image}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/InfoBadge/InfoBadge.xaml b/src/Wpf.Ui/Controls/InfoBadge/InfoBadge.xaml
index 3a2d3f387..0bfad025d 100644
--- a/src/Wpf.Ui/Controls/InfoBadge/InfoBadge.xaml
+++ b/src/Wpf.Ui/Controls/InfoBadge/InfoBadge.xaml
@@ -1,54 +1,56 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <CornerRadius x:Key="ValueInfoBadgeStyleCornerRadius">8</CornerRadius>
     <Thickness x:Key="IconBadgeMargin">2</Thickness>
 
-    <Style x:Key="DotInfoBadgeStyle" TargetType="{x:Type controls:InfoBadge}">
+    <Style x:Key="DotInfoBadgeStyle"
+           TargetType="{x:Type controls:InfoBadge}"
+           >
         <Setter Property="Background">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource InfoBadgeInformationSeverityBackgroundBrush}" />
+                <SolidColorBrush Color="{DynamicResource InfoBadgeInformationSeverityBackgroundBrush}"/>
             </Setter.Value>
         </Setter>
 
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="FontWeight" Value="Normal"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:InfoBadge}">
                     <Grid x:Name="InfoBadgeRoot">
-                        <Border
-                            x:Name="ContentBorder"
-                            Width="6"
-                            Height="6"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Background="{TemplateBinding Background}"
-                            BorderThickness="0"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Opacity="{TemplateBinding Opacity}" />
+                        <Border x:Name="ContentBorder"
+                                Width="6"
+                                Height="6"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Background="{TemplateBinding Background}"
+                                BorderThickness="0"
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                Opacity="{TemplateBinding Opacity}"
+                                />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Severity" Value="Attention">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeAttentionSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeAttentionSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Informational">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeInformationalSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeInformationalSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Success">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeSuccessSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeSuccessSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Caution">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeCautionSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeCautionSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Critical">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeCriticalSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeCriticalSeverityBackgroundBrush}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
 
@@ -58,56 +60,58 @@
 
     </Style>
 
-    <Style x:Key="IconInfoBadgeStyle" TargetType="{x:Type controls:InfoBadge}">
+    <Style x:Key="IconInfoBadgeStyle"
+           TargetType="{x:Type controls:InfoBadge}"
+           >
         <Setter Property="Background">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource InfoBadgeInformationSeverityBackgroundBrush}" />
+                <SolidColorBrush Color="{DynamicResource InfoBadgeInformationSeverityBackgroundBrush}"/>
             </Setter.Value>
         </Setter>
 
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="FontWeight" Value="Normal"/>
 
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:InfoBadge}">
                     <Grid x:Name="InfoBadgeRoot">
-                        <Border
-                            x:Name="ContentBorder"
-                            Background="{TemplateBinding Background}"
-                            BorderThickness="0"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Opacity="{TemplateBinding Opacity}">
-                            <ContentPresenter
-                                x:Name="ControlIcon"
-                                Margin="10"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding Icon}"
-                                Focusable="False"
-                                TextElement.FontSize="{TemplateBinding FontSize}"
-                                TextElement.Foreground="{DynamicResource InfoBadgeValueForeground}" />
+                        <Border x:Name="ContentBorder"
+                                Background="{TemplateBinding Background}"
+                                BorderThickness="0"
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                Opacity="{TemplateBinding Opacity}"
+                                >
+                            <ContentPresenter x:Name="ControlIcon"
+                                              Margin="10"
+                                              HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              Content="{TemplateBinding Icon}"
+                                              Focusable="False"
+                                              TextElement.FontSize="{TemplateBinding FontSize}"
+                                              TextElement.Foreground="{DynamicResource InfoBadgeValueForeground}"
+                                              />
                         </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Severity" Value="Attention">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeAttentionSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeAttentionSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Informational">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeInformationalSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeInformationalSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Success">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeSuccessSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeSuccessSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Caution">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeCautionSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeCautionSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Critical">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeCriticalSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeCriticalSeverityBackgroundBrush}"/>
                         </Trigger>
 
                     </ControlTemplate.Triggers>
@@ -118,64 +122,66 @@
 
     </Style>
 
-    <Style x:Key="ValueInfoBadgeStyle" TargetType="{x:Type controls:InfoBadge}">
+    <Style x:Key="ValueInfoBadgeStyle"
+           TargetType="{x:Type controls:InfoBadge}"
+           >
         <Setter Property="Background">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource InfoBadgeInformationSeverityBackgroundBrush}" />
+                <SolidColorBrush Color="{DynamicResource InfoBadgeInformationSeverityBackgroundBrush}"/>
             </Setter.Value>
         </Setter>
 
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="FontWeight" Value="Normal"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:InfoBadge}">
                     <Grid x:Name="InfoBadgeRoot">
-                        <Border
-                            x:Name="ContentBorder"
-                            Width="{TemplateBinding Width}"
-                            Height="{TemplateBinding Height}"
-                            MinWidth="16"
-                            MinHeight="16"
-                            Margin="{StaticResource IconBadgeMargin}"
-                            Padding="3,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Background="{TemplateBinding Background}"
-                            BorderThickness="0"
-                            CornerRadius="{StaticResource ValueInfoBadgeStyleCornerRadius}"
-                            Opacity="{TemplateBinding Opacity}">
-                            <TextBlock
-                                x:Name="TextBlock"
+                        <Border x:Name="ContentBorder"
+                                Width="{TemplateBinding Width}"
+                                Height="{TemplateBinding Height}"
+                                MinWidth="16"
+                                MinHeight="16"
+                                Margin="{StaticResource IconBadgeMargin}"
+                                Padding="3,0"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Focusable="False"
-                                FontSize="{TemplateBinding FontSize}"
-                                Foreground="{DynamicResource InfoBadgeValueForeground}"
-                                Text="{TemplateBinding Value}"
-                                TextWrapping="Wrap" />
+                                Background="{TemplateBinding Background}"
+                                BorderThickness="0"
+                                CornerRadius="{StaticResource ValueInfoBadgeStyleCornerRadius}"
+                                Opacity="{TemplateBinding Opacity}"
+                                >
+                            <TextBlock x:Name="TextBlock"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       Focusable="False"
+                                       FontSize="{TemplateBinding FontSize}"
+                                       Foreground="{DynamicResource InfoBadgeValueForeground}"
+                                       Text="{TemplateBinding Value}"
+                                       TextWrapping="Wrap"
+                                       />
 
                         </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Severity" Value="Attention">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeAttentionSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeAttentionSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Informational">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeInformationalSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeInformationalSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Success">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeSuccessSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeSuccessSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Caution">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeCautionSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeCautionSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Critical">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeCriticalSeverityBackgroundBrush}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBadgeCriticalSeverityBackgroundBrush}"/>
                         </Trigger>
 
 
@@ -186,6 +192,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource ValueInfoBadgeStyle}" TargetType="{x:Type controls:InfoBadge}" />
+    <Style BasedOn="{StaticResource ValueInfoBadgeStyle}"
+           TargetType="{x:Type controls:InfoBadge}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/InfoBar/InfoBar.xaml b/src/Wpf.Ui/Controls/InfoBar/InfoBar.xaml
index 44da6f3f1..58cef20bb 100644
--- a/src/Wpf.Ui/Controls/InfoBar/InfoBar.xaml
+++ b/src/Wpf.Ui/Controls/InfoBar/InfoBar.xaml
@@ -5,10 +5,10 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Thickness x:Key="InfoBarPadding">14,8,14,8</Thickness>
     <Thickness x:Key="InfoBarBorderThemeThickness">1</Thickness>
@@ -16,81 +16,85 @@
     <Style TargetType="{x:Type controls:InfoBar}">
         <Setter Property="Background">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
+                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}"/>
             </Setter.Value>
         </Setter>
-        <Setter Property="Foreground" Value="{DynamicResource InfoBarTitleForeground}" />
-        <Setter Property="Padding" Value="{StaticResource InfoBarPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="BorderBrush" Value="{DynamicResource InfoBarBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource InfoBarBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource InfoBarTitleForeground}"/>
+        <Setter Property="Padding" Value="{StaticResource InfoBarPadding}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource InfoBarBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource InfoBarBorderThemeThickness}"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:InfoBar}">
                     <Grid x:Name="InfoBarRoot">
-                        <Border
-                            x:Name="ContentBorder"
-                            Padding="16,14,16,10"
-                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}">
+                        <Border x:Name="ContentBorder"
+                                Padding="16,14,16,10"
+                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                >
                             <Grid>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <Border Margin="0,2,14,0" VerticalAlignment="Top">
-                                    <controls:SymbolIcon
-                                        x:Name="SymbolIcon"
+                                <Border Margin="0,2,14,0"
                                         VerticalAlignment="Top"
-                                        Filled="True"
-                                        FontSize="16" />
+                                        >
+                                    <controls:SymbolIcon x:Name="SymbolIcon"
+                                                         VerticalAlignment="Top"
+                                                         Filled="True"
+                                                         FontSize="16"
+                                                         />
                                 </Border>
 
-                                <WrapPanel Grid.Column="1" VerticalAlignment="Top">
-                                    <TextBlock
-                                        Margin="0,0,14,0"
-                                        ScrollViewer.CanContentScroll="False"
-                                        Text="{TemplateBinding Title}"
-                                        TextElement.FontSize="{TemplateBinding FontSize}"
-                                        TextElement.FontWeight="SemiBold"
-                                        TextWrapping="Wrap" />
+                                <WrapPanel Grid.Column="1"
+                                           VerticalAlignment="Top"
+                                           >
+                                    <TextBlock Margin="0,0,14,0"
+                                               ScrollViewer.CanContentScroll="False"
+                                               Text="{TemplateBinding Title}"
+                                               TextElement.FontSize="{TemplateBinding FontSize}"
+                                               TextElement.FontWeight="SemiBold"
+                                               TextWrapping="Wrap"
+                                               />
 
-                                    <TextBlock
-                                        Margin="0"
-                                        ScrollViewer.CanContentScroll="False"
-                                        Text="{TemplateBinding Message}"
-                                        TextElement.FontSize="{TemplateBinding FontSize}"
-                                        TextWrapping="Wrap" />
+                                    <TextBlock Margin="0"
+                                               ScrollViewer.CanContentScroll="False"
+                                               Text="{TemplateBinding Message}"
+                                               TextElement.FontSize="{TemplateBinding FontSize}"
+                                               TextWrapping="Wrap"
+                                               />
                                 </WrapPanel>
 
-                                <Border
-                                    Grid.Column="2"
-                                    Margin="12,-2,0,0"
-                                    VerticalAlignment="Top">
-                                    <controls:Button
-                                        x:Name="CloseButton"
-                                        Padding="4"
-                                        Background="Transparent"
-                                        BorderThickness="0"
-                                        Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                        IsEnabled="True">
+                                <Border Grid.Column="2"
+                                        Margin="12,-2,0,0"
+                                        VerticalAlignment="Top"
+                                        >
+                                    <controls:Button x:Name="CloseButton"
+                                                     Padding="4"
+                                                     Background="Transparent"
+                                                     BorderThickness="0"
+                                                     Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                                     IsEnabled="True"
+                                                     >
                                         <controls:Button.Icon>
-                                            <controls:SymbolIcon Symbol="Dismiss24" />
+                                            <controls:SymbolIcon Symbol="Dismiss24"/>
                                         </controls:Button.Icon>
                                     </controls:Button>
                                 </Border>
@@ -99,39 +103,39 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsClosable" Value="False">
-                            <Setter TargetName="CloseButton" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="CloseButton" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
 
                         <Trigger Property="IsOpen" Value="True">
-                            <Setter TargetName="InfoBarRoot" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="InfoBarRoot" Property="Visibility" Value="Visible"/>
                         </Trigger>
                         <Trigger Property="IsOpen" Value="False">
-                            <Setter TargetName="InfoBarRoot" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="InfoBarRoot" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
 
                         <Trigger Property="Severity" Value="Informational">
                             <Setter TargetName="SymbolIcon" Property="Foreground">
                                 <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
+                                    <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}"/>
                                 </Setter.Value>
                             </Setter>
-                            <Setter TargetName="SymbolIcon" Property="Symbol" Value="Info24" />
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBarInformationalSeverityBackgroundBrush}" />
+                            <Setter TargetName="SymbolIcon" Property="Symbol" Value="Info24"/>
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBarInformationalSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Success">
-                            <Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource InfoBarSuccessSeverityIconBackground}" />
-                            <Setter TargetName="SymbolIcon" Property="Symbol" Value="CheckmarkCircle24" />
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBarSuccessSeverityBackgroundBrush}" />
+                            <Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource InfoBarSuccessSeverityIconBackground}"/>
+                            <Setter TargetName="SymbolIcon" Property="Symbol" Value="CheckmarkCircle24"/>
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBarSuccessSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Warning">
-                            <Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource InfoBarWarningSeverityIconBackground}" />
-                            <Setter TargetName="SymbolIcon" Property="Symbol" Value="ErrorCircle24" />
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBarWarningSeverityBackgroundBrush}" />
+                            <Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource InfoBarWarningSeverityIconBackground}"/>
+                            <Setter TargetName="SymbolIcon" Property="Symbol" Value="ErrorCircle24"/>
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBarWarningSeverityBackgroundBrush}"/>
                         </Trigger>
                         <Trigger Property="Severity" Value="Error">
-                            <Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource InfoBarErrorSeverityIconBackground}" />
-                            <Setter TargetName="SymbolIcon" Property="Symbol" Value="DismissCircle24" />
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBarErrorSeverityBackgroundBrush}" />
+                            <Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource InfoBarErrorSeverityIconBackground}"/>
+                            <Setter TargetName="SymbolIcon" Property="Symbol" Value="DismissCircle24"/>
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource InfoBarErrorSeverityBackgroundBrush}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/ItemsControl/ItemsControl.xaml b/src/Wpf.Ui/Controls/ItemsControl/ItemsControl.xaml
index 13f01f68d..8f58e8ab4 100644
--- a/src/Wpf.Ui/Controls/ItemsControl/ItemsControl.xaml
+++ b/src/Wpf.Ui/Controls/ItemsControl/ItemsControl.xaml
@@ -5,7 +5,9 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
     <!--
     <Style TargetType="{x:Type ItemsControl}">
         <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
diff --git a/src/Wpf.Ui/Controls/Label/Label.xaml b/src/Wpf.Ui/Controls/Label/Label.xaml
index 16a211b87..20d196f28 100644
--- a/src/Wpf.Ui/Controls/Label/Label.xaml
+++ b/src/Wpf.Ui/Controls/Label/Label.xaml
@@ -5,13 +5,15 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <Style TargetType="{x:Type Label}">
-        <Setter Property="Padding" Value="0,0,0,4" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="{DynamicResource LabelForeground}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Padding" Value="0,0,0,4"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Foreground" Value="{DynamicResource LabelForeground}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ListBox/ListBox.xaml b/src/Wpf.Ui/Controls/ListBox/ListBox.xaml
index de1b16ee2..37e5749ff 100644
--- a/src/Wpf.Ui/Controls/ListBox/ListBox.xaml
+++ b/src/Wpf.Ui/Controls/ListBox/ListBox.xaml
@@ -5,28 +5,32 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style x:Key="DefaultListBoxStyle" TargetType="{x:Type ListBox}">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
-        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultListBoxStyle"
+           TargetType="{x:Type ListBox}"
+           >
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
+        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <VirtualizingStackPanel IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}" VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}" />
+                    <VirtualizingStackPanel IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
+                                            VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}"
+                                            />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
@@ -34,17 +38,17 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBox}">
                     <Grid>
-                        <controls:PassiveScrollViewer
-                            x:Name="PART_ContentHost"
-                            CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
-                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                            <ItemsPresenter />
+                        <controls:PassiveScrollViewer x:Name="PART_ContentHost"
+                                                      CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                      >
+                            <ItemsPresenter/>
                         </controls:PassiveScrollViewer>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsGrouping" Value="True">
-                            <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -52,6 +56,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultListBoxStyle}" TargetType="{x:Type ListBox}" />
+    <Style BasedOn="{StaticResource DefaultListBoxStyle}"
+           TargetType="{x:Type ListBox}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ListBox/ListBoxItem.xaml b/src/Wpf.Ui/Controls/ListBox/ListBoxItem.xaml
index 39e9658b0..d64c6d50e 100644
--- a/src/Wpf.Ui/Controls/ListBox/ListBoxItem.xaml
+++ b/src/Wpf.Ui/Controls/ListBox/ListBoxItem.xaml
@@ -5,38 +5,40 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+                    >
 
-    <converters:BrushToColorConverter x:Key="BrushToColorConverter" />
+    <converters:BrushToColorConverter x:Key="BrushToColorConverter"/>
 
-    <Style x:Key="DefaultListBoxItemStyle" TargetType="{x:Type ListBoxItem}">
-        <Setter Property="Foreground" Value="{DynamicResource ListBoxItemForeground}" />
-        <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedBackgroundThemeBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ListBoxItemSelectedBackgroundThemeBrush}" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="12" />
-        <Setter Property="Border.CornerRadius" Value="0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultListBoxItemStyle"
+           TargetType="{x:Type ListBoxItem}"
+           >
+        <Setter Property="Foreground" Value="{DynamicResource ListBoxItemForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedBackgroundThemeBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ListBoxItemSelectedBackgroundThemeBrush}"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="12"/>
+        <Setter Property="Border.CornerRadius" Value="0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <Border
-                        x:Name="Border"
-                        Margin="0"
-                        Padding="{TemplateBinding Padding}"
-                        Background="Transparent"
-                        BorderThickness="1"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}">
-                        <ContentPresenter />
+                    <Border x:Name="Border"
+                            Margin="0"
+                            Padding="{TemplateBinding Padding}"
+                            Background="Transparent"
+                            BorderThickness="1"
+                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                            >
+                        <ContentPresenter/>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListBoxItemSelectedBackgroundThemeBrush}" />
-                            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForegroundThemeBrush}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListBoxItemSelectedBackgroundThemeBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForegroundThemeBrush}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -44,6 +46,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultListBoxItemStyle}" TargetType="{x:Type ListBoxItem}" />
+    <Style BasedOn="{StaticResource DefaultListBoxItemStyle}"
+           TargetType="{x:Type ListBoxItem}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ListView/ListView.xaml b/src/Wpf.Ui/Controls/ListView/ListView.xaml
index 6e6eb9711..1d94596e3 100644
--- a/src/Wpf.Ui/Controls/ListView/ListView.xaml
+++ b/src/Wpf.Ui/Controls/ListView/ListView.xaml
@@ -5,165 +5,181 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <ControlTemplate x:Key="NullViewTemplate" TargetType="{x:Type controls:ListView}">
+    <ControlTemplate x:Key="NullViewTemplate"
+                     TargetType="{x:Type controls:ListView}"
+                     >
         <Grid>
-            <controls:PassiveScrollViewer
-                x:Name="PART_ContentHost"
-                CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
-                HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                <ItemsPresenter />
+            <controls:PassiveScrollViewer x:Name="PART_ContentHost"
+                                          CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                                          HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                          VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                          >
+                <ItemsPresenter/>
             </controls:PassiveScrollViewer>
-            <Rectangle
-                x:Name="PART_DisabledVisual"
-                Opacity="0"
-                RadiusX="2"
-                RadiusY="2"
-                Stretch="Fill"
-                Stroke="Transparent"
-                StrokeThickness="0"
-                Visibility="Collapsed">
+            <Rectangle x:Name="PART_DisabledVisual"
+                       Opacity="0"
+                       RadiusX="2"
+                       RadiusY="2"
+                       Stretch="Fill"
+                       Stroke="Transparent"
+                       StrokeThickness="0"
+                       Visibility="Collapsed"
+                       >
                 <Rectangle.Fill>
-                    <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
+                    <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}"/>
                 </Rectangle.Fill>
             </Rectangle>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsGrouping" Value="True">
-                <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter TargetName="PART_DisabledVisual" Property="Visibility" Value="Visible" />
+                <Setter TargetName="PART_DisabledVisual" Property="Visibility" Value="Visible"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="GridViewScrollViewerTemplate" TargetType="ScrollViewer">
+    <ControlTemplate x:Key="GridViewScrollViewerTemplate"
+                     TargetType="ScrollViewer"
+                     >
         <Grid Background="Transparent">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <DockPanel Margin="{TemplateBinding Control.Padding}">
-                <ScrollViewer
-                    DockPanel.Dock="Top"
-                    Focusable="False"
-                    HorizontalScrollBarVisibility="Hidden"
-                    VerticalScrollBarVisibility="Hidden">
+                <ScrollViewer DockPanel.Dock="Top"
+                              Focusable="False"
+                              HorizontalScrollBarVisibility="Hidden"
+                              VerticalScrollBarVisibility="Hidden"
+                              >
                     <!--  margin-left matched to listviewitem.padding  -->
-                    <controls:GridViewHeaderRowPresenter
-                        Margin="4"
-                        AllowsColumnReorder="{Binding Path=View.AllowsColumnReorder, RelativeSource={RelativeSource AncestorType=ListView}}"
-                        ColumnHeaderContainerStyle="{Binding Path=View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource AncestorType=ListView}}"
-                        ColumnHeaderContextMenu="{Binding Path=View.ColumnHeaderContextMenu, RelativeSource={RelativeSource AncestorType=ListView}}"
-                        ColumnHeaderTemplate="{Binding Path=View.ColumnHeaderTemplate, RelativeSource={RelativeSource AncestorType=ListView}}"
-                        ColumnHeaderToolTip="{Binding Path=View.ColumnHeaderToolTip, RelativeSource={RelativeSource AncestorType=ListView}}"
-                        Columns="{Binding Path=View.Columns, RelativeSource={RelativeSource AncestorType=ListView}}"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    <controls:GridViewHeaderRowPresenter Margin="4"
+                                                         AllowsColumnReorder="{Binding Path=View.AllowsColumnReorder, RelativeSource={RelativeSource AncestorType=ListView}}"
+                                                         ColumnHeaderContainerStyle="{Binding Path=View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource AncestorType=ListView}}"
+                                                         ColumnHeaderContextMenu="{Binding Path=View.ColumnHeaderContextMenu, RelativeSource={RelativeSource AncestorType=ListView}}"
+                                                         ColumnHeaderTemplate="{Binding Path=View.ColumnHeaderTemplate, RelativeSource={RelativeSource AncestorType=ListView}}"
+                                                         ColumnHeaderToolTip="{Binding Path=View.ColumnHeaderToolTip, RelativeSource={RelativeSource AncestorType=ListView}}"
+                                                         Columns="{Binding Path=View.Columns, RelativeSource={RelativeSource AncestorType=ListView}}"
+                                                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                         />
                 </ScrollViewer>
-                <ScrollContentPresenter
-                    Name="PART_ScrollContentPresenter"
-                    CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
-                    CanHorizontallyScroll="False"
-                    CanVerticallyScroll="False"
-                    Content="{TemplateBinding ContentControl.Content}"
-                    ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
-                    KeyboardNavigation.DirectionalNavigation="Local"
-                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                <ScrollContentPresenter Name="PART_ScrollContentPresenter"
+                                        CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                                        CanHorizontallyScroll="False"
+                                        CanVerticallyScroll="False"
+                                        Content="{TemplateBinding ContentControl.Content}"
+                                        ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
+                                        KeyboardNavigation.DirectionalNavigation="Local"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                        />
             </DockPanel>
-            <ScrollBar
-                Name="PART_HorizontalScrollBar"
-                Grid.Row="1"
-                Cursor="Arrow"
-                Maximum="{TemplateBinding ScrollViewer.ScrollableWidth}"
-                Minimum="0"
-                Orientation="Horizontal"
-                Visibility="{TemplateBinding ScrollViewer.ComputedHorizontalScrollBarVisibility}"
-                Value="{Binding Path=HorizontalOffset, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-            <ScrollBar
-                Name="PART_VerticalScrollBar"
-                Grid.Column="1"
-                Cursor="Arrow"
-                Maximum="{TemplateBinding ScrollViewer.ScrollableHeight}"
-                Minimum="0"
-                Orientation="Vertical"
-                Visibility="{TemplateBinding ScrollViewer.ComputedVerticalScrollBarVisibility}"
-                Value="{Binding Path=VerticalOffset, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-            <DockPanel
-                Grid.Row="1"
-                Grid.Column="1"
-                LastChildFill="False">
-                <Rectangle
-                    Width="1"
-                    DockPanel.Dock="Left"
-                    Fill="#FFFFFFFF"
-                    Visibility="{TemplateBinding ScrollViewer.ComputedVerticalScrollBarVisibility}" />
-                <Rectangle
-                    Height="1"
-                    DockPanel.Dock="Top"
-                    Fill="#FFFFFFFF"
-                    Visibility="{TemplateBinding ScrollViewer.ComputedHorizontalScrollBarVisibility}" />
+            <ScrollBar Name="PART_HorizontalScrollBar"
+                       Grid.Row="1"
+                       Cursor="Arrow"
+                       Maximum="{TemplateBinding ScrollViewer.ScrollableWidth}"
+                       Minimum="0"
+                       Orientation="Horizontal"
+                       Visibility="{TemplateBinding ScrollViewer.ComputedHorizontalScrollBarVisibility}"
+                       Value="{Binding Path=HorizontalOffset, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                       />
+            <ScrollBar Name="PART_VerticalScrollBar"
+                       Grid.Column="1"
+                       Cursor="Arrow"
+                       Maximum="{TemplateBinding ScrollViewer.ScrollableHeight}"
+                       Minimum="0"
+                       Orientation="Vertical"
+                       Visibility="{TemplateBinding ScrollViewer.ComputedVerticalScrollBarVisibility}"
+                       Value="{Binding Path=VerticalOffset, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                       />
+            <DockPanel Grid.Row="1"
+                       Grid.Column="1"
+                       LastChildFill="False"
+                       >
+                <Rectangle Width="1"
+                           DockPanel.Dock="Left"
+                           Fill="#FFFFFFFF"
+                           Visibility="{TemplateBinding ScrollViewer.ComputedVerticalScrollBarVisibility}"
+                           />
+                <Rectangle Height="1"
+                           DockPanel.Dock="Top"
+                           Fill="#FFFFFFFF"
+                           Visibility="{TemplateBinding ScrollViewer.ComputedHorizontalScrollBarVisibility}"
+                           />
             </DockPanel>
         </Grid>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="GridViewTemplate" TargetType="{x:Type controls:ListView}">
-        <Border
-            Name="Bd"
-            Background="Transparent"
-            BorderBrush="{TemplateBinding Border.BorderBrush}"
-            BorderThickness="{TemplateBinding Border.BorderThickness}">
-            <controls:PassiveScrollViewer
-                Padding="{TemplateBinding Control.Padding}"
-                CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
-                Focusable="False"
-                Template="{DynamicResource GridViewScrollViewerTemplate}">
-                <ItemsPresenter />
+    <ControlTemplate x:Key="GridViewTemplate"
+                     TargetType="{x:Type controls:ListView}"
+                     >
+        <Border Name="Bd"
+                Background="Transparent"
+                BorderBrush="{TemplateBinding Border.BorderBrush}"
+                BorderThickness="{TemplateBinding Border.BorderThickness}"
+                >
+            <controls:PassiveScrollViewer Padding="{TemplateBinding Control.Padding}"
+                                          CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                                          Focusable="False"
+                                          Template="{DynamicResource GridViewScrollViewerTemplate}"
+                                          >
+                <ItemsPresenter/>
             </controls:PassiveScrollViewer>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="ListViewStyle" TargetType="{x:Type controls:ListView}">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
-        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Style x:Key="ListViewStyle"
+           TargetType="{x:Type controls:ListView}"
+           >
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
+        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Style.Triggers>
-            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Static controls:ListViewViewState.Default}">
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="{x:Static controls:ListViewViewState.Default}"
+                         >
                 <Setter Property="ItemsPanel">
                     <Setter.Value>
                         <ItemsPanelTemplate>
-                            <VirtualizingStackPanel IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}" VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}" />
+                            <VirtualizingStackPanel IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
+                                                    VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}"
+                                                    />
                         </ItemsPanelTemplate>
                     </Setter.Value>
                 </Setter>
-                <Setter Property="Template" Value="{DynamicResource NullViewTemplate}" />
+                <Setter Property="Template" Value="{DynamicResource NullViewTemplate}"/>
             </DataTrigger>
-            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Static controls:ListViewViewState.GridView}">
-                <Setter Property="Template" Value="{DynamicResource GridViewTemplate}" />
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource Mode=Self}}"
+                         Value="{x:Static controls:ListViewViewState.GridView}"
+                         >
+                <Setter Property="Template" Value="{DynamicResource GridViewTemplate}"/>
             </DataTrigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource ListViewStyle}" TargetType="{x:Type controls:ListView}" />
+    <Style BasedOn="{StaticResource ListViewStyle}"
+           TargetType="{x:Type controls:ListView}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml b/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
index 1a4947958..feec6de92 100644
--- a/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
+++ b/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
@@ -5,108 +5,120 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <ControlTemplate x:Key="NullViewItemTemplate" TargetType="{x:Type controls:ListViewItem}">
-        <Border
-            x:Name="Border"
-            Margin="0"
-            Padding="0"
-            Background="Transparent"
-            BorderThickness="1"
-            CornerRadius="{TemplateBinding Border.CornerRadius}">
+    <ControlTemplate x:Key="NullViewItemTemplate"
+                     TargetType="{x:Type controls:ListViewItem}"
+                     >
+        <Border x:Name="Border"
+                Margin="0"
+                Padding="0"
+                Background="Transparent"
+                BorderThickness="1"
+                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                >
             <Grid>
-                <ContentPresenter Margin="{TemplateBinding Padding}" />
-                <Rectangle
-                    x:Name="ActiveRectangle"
-                    Width="3"
-                    Height="18"
-                    Margin="0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    Fill="{DynamicResource ListViewItemPillFillBrush}"
-                    RadiusX="2"
-                    RadiusY="2"
-                    Visibility="Collapsed" />
+                <ContentPresenter Margin="{TemplateBinding Padding}"/>
+                <Rectangle x:Name="ActiveRectangle"
+                           Width="3"
+                           Height="18"
+                           Margin="0"
+                           HorizontalAlignment="Left"
+                           VerticalAlignment="Center"
+                           Fill="{DynamicResource ListViewItemPillFillBrush}"
+                           RadiusX="2"
+                           RadiusY="2"
+                           Visibility="Collapsed"
+                           />
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsEnabled" Value="True" />
-                    <Condition Property="IsMouseOver" Value="True" />
+                    <Condition Property="IsEnabled" Value="True"/>
+                    <Condition Property="IsMouseOver" Value="True"/>
                 </MultiTrigger.Conditions>
-                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}"/>
             </MultiTrigger>
             <Trigger Property="IsSelected" Value="True">
-                <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible" />
-                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
+                <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-  <ControlTemplate x:Key="GridViewItemTemplate" TargetType="{x:Type controls:ListViewItem}">
-        <Border
-            x:Name="Border"
-            Margin="0"
-            Padding="0"
-            Background="Transparent"
-            BorderBrush="{TemplateBinding Border.BorderBrush}"
-            BorderThickness="{TemplateBinding Border.BorderThickness}"
-            CornerRadius="{TemplateBinding Border.CornerRadius}">
+    <ControlTemplate x:Key="GridViewItemTemplate"
+                     TargetType="{x:Type controls:ListViewItem}"
+                     >
+        <Border x:Name="Border"
+                Margin="0"
+                Padding="0"
+                Background="Transparent"
+                BorderBrush="{TemplateBinding Border.BorderBrush}"
+                BorderThickness="{TemplateBinding Border.BorderThickness}"
+                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                >
             <Grid>
-                <controls:GridViewRowPresenter
-                    Margin="{TemplateBinding Padding}"
-                    VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}"
-                    Columns="{TemplateBinding GridView.ColumnCollection}"
-                    Content="{TemplateBinding ContentControl.Content}" />
-                <Rectangle
-                    x:Name="ActiveRectangle"
-                    Width="3"
-                    Height="18"
-                    Margin="0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    Fill="{DynamicResource ListViewItemPillFillBrush}"
-                    RadiusX="2"
-                    RadiusY="2"
-                    Visibility="Collapsed" />
+                <controls:GridViewRowPresenter Margin="{TemplateBinding Padding}"
+                                               VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}"
+                                               Columns="{TemplateBinding GridView.ColumnCollection}"
+                                               Content="{TemplateBinding ContentControl.Content}"
+                                               />
+                <Rectangle x:Name="ActiveRectangle"
+                           Width="3"
+                           Height="18"
+                           Margin="0"
+                           HorizontalAlignment="Left"
+                           VerticalAlignment="Center"
+                           Fill="{DynamicResource ListViewItemPillFillBrush}"
+                           RadiusX="2"
+                           RadiusY="2"
+                           Visibility="Collapsed"
+                           />
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsEnabled" Value="True" />
-                    <Condition Property="IsMouseOver" Value="True" />
+                    <Condition Property="IsEnabled" Value="True"/>
+                    <Condition Property="IsMouseOver" Value="True"/>
                 </MultiTrigger.Conditions>
-                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}"/>
             </MultiTrigger>
             <Trigger Property="IsSelected" Value="True">
-                <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible" />
-                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
+                <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="ListViewItemStyle" TargetType="{x:Type controls:ListViewItem}">
-        <Setter Property="Foreground" Value="{DynamicResource ListViewItemForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="Margin" Value="0,0,0,2" />
-        <Setter Property="Padding" Value="4" />
+    <Style x:Key="ListViewItemStyle"
+           TargetType="{x:Type controls:ListViewItem}"
+           >
+        <Setter Property="Foreground" Value="{DynamicResource ListViewItemForeground}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="Margin" Value="0,0,0,2"/>
+        <Setter Property="Padding" Value="4"/>
         <Style.Triggers>
-            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource AncestorType={x:Type ListView}}}" Value="Default">
-                <Setter Property="Template" Value="{DynamicResource NullViewItemTemplate}" />
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource AncestorType={x:Type ListView}}}"
+                         Value="Default"
+                         >
+                <Setter Property="Template" Value="{DynamicResource NullViewItemTemplate}"/>
             </DataTrigger>
-            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource AncestorType={x:Type ListView}}}" Value="GridView">
-                <Setter Property="Template" Value="{DynamicResource GridViewItemTemplate}" />
+            <DataTrigger Binding="{Binding Path=ViewState, RelativeSource={RelativeSource AncestorType={x:Type ListView}}}"
+                         Value="GridView"
+                         >
+                <Setter Property="Template" Value="{DynamicResource GridViewItemTemplate}"/>
             </DataTrigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource ListViewItemStyle}" TargetType="{x:Type controls:ListViewItem}" />
+    <Style BasedOn="{StaticResource ListViewItemStyle}"
+           TargetType="{x:Type controls:ListViewItem}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/LoadingScreen/LoadingScreen.xaml b/src/Wpf.Ui/Controls/LoadingScreen/LoadingScreen.xaml
index 1ccec88bf..3fc2bec29 100644
--- a/src/Wpf.Ui/Controls/LoadingScreen/LoadingScreen.xaml
+++ b/src/Wpf.Ui/Controls/LoadingScreen/LoadingScreen.xaml
@@ -5,34 +5,38 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Style TargetType="{x:Type controls:LoadingScreen}">
-        <Setter Property="Background" Value="{DynamicResource LoadingScreenForeground}" />
-        <Setter Property="Background" Value="{DynamicResource LoadingScreenBackground}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource LoadingScreenForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource LoadingScreenBackground}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:LoadingScreen}">
-                    <Grid
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        Background="{TemplateBinding Background}">
+                    <Grid Width="{TemplateBinding Width}"
+                          Height="{TemplateBinding Height}"
+                          Background="{TemplateBinding Background}"
+                          >
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
 
-                        <Grid Grid.Column="0" VerticalAlignment="Center">
-                            <controls:ProgressRing IsIndeterminate="True" />
+                        <Grid Grid.Column="0"
+                              VerticalAlignment="Center"
+                              >
+                            <controls:ProgressRing IsIndeterminate="True"/>
                         </Grid>
 
-                        <Grid Grid.Column="1" VerticalAlignment="Center">
-                            <ContentPresenter />
+                        <Grid Grid.Column="1"
+                              VerticalAlignment="Center"
+                              >
+                            <ContentPresenter/>
                         </Grid>
                     </Grid>
                 </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/Menu/Menu.xaml b/src/Wpf.Ui/Controls/Menu/Menu.xaml
index 70c9f50a3..d0c7d678c 100644
--- a/src/Wpf.Ui/Controls/Menu/Menu.xaml
+++ b/src/Wpf.Ui/Controls/Menu/Menu.xaml
@@ -5,36 +5,38 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style x:Key="DefaultMenuStyle" TargetType="{x:Type Menu}">
-        <Setter Property="Background" Value="{DynamicResource MenuBarBackground}" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Style x:Key="DefaultMenuStyle"
+           TargetType="{x:Type Menu}"
+           >
+        <Setter Property="Background" Value="{DynamicResource MenuBarBackground}"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Menu}">
-                    <Border
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
-                        <StackPanel
-                            ClipToBounds="True"
-                            IsItemsHost="True"
-                            Orientation="Horizontal" />
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            >
+                        <StackPanel ClipToBounds="True"
+                                    IsItemsHost="True"
+                                    Orientation="Horizontal"
+                                    />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style
-        x:Key="{x:Type Menu}"
-        BasedOn="{StaticResource DefaultMenuStyle}"
-        TargetType="{x:Type Menu}" />
+    <Style x:Key="{x:Type Menu}"
+           BasedOn="{StaticResource DefaultMenuStyle}"
+           TargetType="{x:Type Menu}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/Menu/MenuItem.xaml b/src/Wpf.Ui/Controls/Menu/MenuItem.xaml
index 14d59b749..372ecb0d4 100644
--- a/src/Wpf.Ui/Controls/Menu/MenuItem.xaml
+++ b/src/Wpf.Ui/Controls/Menu/MenuItem.xaml
@@ -5,111 +5,119 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
-
-    <Style
-        x:Key="UiMenuItemScrollViewer"
-        BasedOn="{StaticResource {x:Type ScrollViewer}}"
-        TargetType="{x:Type ScrollViewer}">
-        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
+
+    <Style x:Key="UiMenuItemScrollViewer"
+           BasedOn="{StaticResource {x:Type ScrollViewer}}"
+           TargetType="{x:Type ScrollViewer}"
+           >
+        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
     </Style>
 
     <!--
         DEFAULT WPF MENU ITEM
     -->
 
-    <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="{x:Type Separator}">
-        <Setter Property="BorderBrush" Value="{DynamicResource MenuBarItemBorderBrush}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Margin" Value="0,1,0,1" />
-        <Setter Property="BorderThickness" Value="1,1,0,0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}"
+           TargetType="{x:Type Separator}"
+           >
+        <Setter Property="BorderBrush" Value="{DynamicResource MenuBarItemBorderBrush}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Margin" Value="0,1,0,1"/>
+        <Setter Property="BorderThickness" Value="1,1,0,0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Separator}">
-                    <Border
-                        Width="{TemplateBinding Width}"
-                        Margin="{TemplateBinding Margin}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}" />
+                    <Border Width="{TemplateBinding Width}"
+                            Margin="{TemplateBinding Margin}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
     <!--  TopLevelHeader  -->
-    <ControlTemplate x:Key="{x:Static MenuItem.TopLevelHeaderTemplateKey}" TargetType="{x:Type MenuItem}">
-        <Border
-            x:Name="Border"
-            Margin="4"
-            Background="Transparent"
-            CornerRadius="6">
+    <ControlTemplate x:Key="{x:Static MenuItem.TopLevelHeaderTemplateKey}"
+                     TargetType="{x:Type MenuItem}"
+                     >
+        <Border x:Name="Border"
+                Margin="4"
+                Background="Transparent"
+                CornerRadius="6"
+                >
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
 
                 <Grid Margin="10">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
-                    <ContentPresenter
-                        x:Name="Icon"
-                        Grid.Column="0"
-                        Margin="0,0,6,0"
-                        VerticalAlignment="Center"
-                        Content="{TemplateBinding Icon}" />
-                    <ContentPresenter
-                        x:Name="HeaderPresenter"
-                        Grid.Column="1"
-                        VerticalAlignment="Center"
-                        ContentSource="Header"
-                        RecognizesAccessKey="True"
-                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                    <ContentPresenter x:Name="Icon"
+                                      Grid.Column="0"
+                                      Margin="0,0,6,0"
+                                      VerticalAlignment="Center"
+                                      Content="{TemplateBinding Icon}"
+                                      />
+                    <ContentPresenter x:Name="HeaderPresenter"
+                                      Grid.Column="1"
+                                      VerticalAlignment="Center"
+                                      ContentSource="Header"
+                                      RecognizesAccessKey="True"
+                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                      />
                 </Grid>
 
-                <Popup
-                    x:Name="Popup"
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    AllowsTransparency="True"
-                    Focusable="False"
-                    HorizontalOffset="-12"
-                    IsOpen="{TemplateBinding IsSubmenuOpen}"
-                    Placement="Bottom"
-                    PlacementTarget="{Binding ElementName=Border}"
-                    PopupAnimation="None"
-                    VerticalOffset="1">
+                <Popup x:Name="Popup"
+                       Grid.Row="1"
+                       Grid.Column="0"
+                       AllowsTransparency="True"
+                       Focusable="False"
+                       HorizontalOffset="-12"
+                       IsOpen="{TemplateBinding IsSubmenuOpen}"
+                       Placement="Bottom"
+                       PlacementTarget="{Binding ElementName=Border}"
+                       PopupAnimation="None"
+                       VerticalOffset="1"
+                       >
                     <Grid>
-                        <Border
-                            x:Name="SubmenuBorder"
-                            Margin="12,0,12,18"
-                            Padding="0,3,0,3"
-                            Background="{DynamicResource FlyoutBackground}"
-                            BorderBrush="{DynamicResource FlyoutBorderBrush}"
-                            BorderThickness="1"
-                            CornerRadius="8"
-                            SnapsToDevicePixels="True">
+                        <Border x:Name="SubmenuBorder"
+                                Margin="12,0,12,18"
+                                Padding="0,3,0,3"
+                                Background="{DynamicResource FlyoutBackground}"
+                                BorderBrush="{DynamicResource FlyoutBorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="8"
+                                SnapsToDevicePixels="True"
+                                >
                             <Border.RenderTransform>
-                                <TranslateTransform />
+                                <TranslateTransform/>
                             </Border.RenderTransform>
-                            <controls:PassiveScrollViewer CanContentScroll="True" Style="{StaticResource UiMenuItemScrollViewer}">
-                                <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+                            <controls:PassiveScrollViewer CanContentScroll="True"
+                                                          Style="{StaticResource UiMenuItemScrollViewer}"
+                                                          >
+                                <StackPanel IsItemsHost="True"
+                                            KeyboardNavigation.DirectionalNavigation="Cycle"
+                                            />
                             </controls:PassiveScrollViewer>
                             <Border.Effect>
-                                <DropShadowEffect
-                                    BlurRadius="20"
-                                    Direction="270"
-                                    Opacity="0.25"
-                                    ShadowDepth="6" />
+                                <DropShadowEffect BlurRadius="20"
+                                                  Direction="270"
+                                                  Opacity="0.25"
+                                                  ShadowDepth="6"
+                                                  />
                             </Border.Effect>
                         </Border>
                     </Grid>
@@ -118,19 +126,19 @@
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="Header" Value="{x:Null}">
-                <Setter TargetName="Icon" Property="Margin" Value="0" />
-                <Setter TargetName="HeaderPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="Icon" Property="Margin" Value="0"/>
+                <Setter TargetName="HeaderPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="IsHighlighted" Value="True">
-                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}" />
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}"/>
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -138,14 +146,14 @@
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="SubmenuBorder"
-                                Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
-                                From="-90"
-                                To="0"
-                                Duration="00:00:00.167">
+                            <DoubleAnimation Storyboard.TargetName="SubmenuBorder"
+                                             Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
+                                             From="-90"
+                                             To="0"
+                                             Duration="00:00:00.167"
+                                             >
                                 <DoubleAnimation.EasingFunction>
-                                    <CircleEase EasingMode="EaseOut" />
+                                    <CircleEase EasingMode="EaseOut"/>
                                 </DoubleAnimation.EasingFunction>
                             </DoubleAnimation>
                         </Storyboard>
@@ -156,48 +164,50 @@
     </ControlTemplate>
 
     <!--  TopLevelItem  -->
-    <ControlTemplate x:Key="{x:Static MenuItem.TopLevelItemTemplateKey}" TargetType="{x:Type MenuItem}">
-        <Border
-            x:Name="Border"
-            Margin="4"
-            Background="Transparent"
-            CornerRadius="6">
+    <ControlTemplate x:Key="{x:Static MenuItem.TopLevelItemTemplateKey}"
+                     TargetType="{x:Type MenuItem}"
+                     >
+        <Border x:Name="Border"
+                Margin="4"
+                Background="Transparent"
+                CornerRadius="6"
+                >
             <Grid Margin="10">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <ContentPresenter
-                    x:Name="Icon"
-                    Grid.Column="0"
-                    Margin="0,0,6,0"
-                    VerticalAlignment="Center"
-                    KeyboardNavigation.IsTabStop="False"
-                    Content="{TemplateBinding Icon}" />
-                <ContentPresenter
-                    x:Name="HeaderPresenter"
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
-                    ContentSource="Header"
-                    RecognizesAccessKey="True"
-                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                <ContentPresenter x:Name="Icon"
+                                  Grid.Column="0"
+                                  Margin="0,0,6,0"
+                                  VerticalAlignment="Center"
+                                  KeyboardNavigation.IsTabStop="False"
+                                  Content="{TemplateBinding Icon}"
+                                  />
+                <ContentPresenter x:Name="HeaderPresenter"
+                                  Grid.Column="1"
+                                  VerticalAlignment="Center"
+                                  ContentSource="Header"
+                                  RecognizesAccessKey="True"
+                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                  />
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="IsHighlighted" Value="True">
-                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}" />
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}"/>
             </Trigger>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="Header" Value="{x:Null}">
-                <Setter TargetName="Icon" Property="Margin" Value="0" />
-                <Setter TargetName="HeaderPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="Icon" Property="Margin" Value="0"/>
+                <Setter TargetName="HeaderPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -205,170 +215,182 @@
     </ControlTemplate>
 
     <!--  SubmenuItem  -->
-    <ControlTemplate x:Key="{x:Static MenuItem.SubmenuItemTemplateKey}" TargetType="{x:Type MenuItem}">
-        <Border
-            x:Name="Border"
-            Margin="4,1,4,1"
-            Background="Transparent"
-            CornerRadius="4">
+    <ControlTemplate x:Key="{x:Static MenuItem.SubmenuItemTemplateKey}"
+                     TargetType="{x:Type MenuItem}"
+                     >
+        <Border x:Name="Border"
+                Margin="4,1,4,1"
+                Background="Transparent"
+                CornerRadius="4"
+                >
             <Grid Margin="8,6,8,6">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"
+                                      SharedSizeGroup="Shortcut"
+                                      />
                 </Grid.ColumnDefinitions>
 
-                <Border
-                    x:Name="CheckBoxIconBorder"
-                    Grid.Column="0"
-                    Width="20"
-                    Height="20"
-                    Margin="0,0,6,0"
-                    VerticalAlignment="Center"
-                    Background="{DynamicResource CheckBoxBackground}"
-                    BorderBrush="{DynamicResource CheckBoxBorderBrush}"
-                    BorderThickness="1"
-                    CornerRadius="4"
-                    Visibility="Collapsed">
-                    <TextBlock
-                        x:Name="CheckBoxIcon"
-                        HorizontalAlignment="Center"
+                <Border x:Name="CheckBoxIconBorder"
+                        Grid.Column="0"
+                        Width="20"
+                        Height="20"
+                        Margin="0,0,6,0"
                         VerticalAlignment="Center"
-                        FontFamily="{DynamicResource FluentSystemIcons}"
-                        FontSize="16"
-                        Text=""
-                        TextAlignment="Center" />
+                        Background="{DynamicResource CheckBoxBackground}"
+                        BorderBrush="{DynamicResource CheckBoxBorderBrush}"
+                        BorderThickness="1"
+                        CornerRadius="4"
+                        Visibility="Collapsed"
+                        >
+                    <TextBlock x:Name="CheckBoxIcon"
+                               HorizontalAlignment="Center"
+                               VerticalAlignment="Center"
+                               FontFamily="{DynamicResource FluentSystemIcons}"
+                               FontSize="16"
+                               Text=""
+                               TextAlignment="Center"
+                               />
                 </Border>
 
-                <ContentPresenter
-                    x:Name="Icon"
-                    Grid.Column="1"
-                    Margin="0,0,6,0"
-                    VerticalAlignment="Center"
-                    KeyboardNavigation.IsTabStop="False"
-                    Content="{TemplateBinding Icon}" />
-
-                <ContentPresenter
-                    Grid.Column="2"
-                    ContentSource="Header"
-                    RecognizesAccessKey="True"
-                    TextElement.Foreground="{TemplateBinding Foreground}" />
-
-                <TextBlock
-                    x:Name="InputGestureText"
-                    Grid.Column="3"
-                    Margin="25,0,0,0"
-                    VerticalAlignment="Bottom"
-                    DockPanel.Dock="Right"
-                    FontSize="11"
-                    Foreground="{DynamicResource TextFillColorDisabledBrush}"
-                    Text="{TemplateBinding InputGestureText}" />
+                <ContentPresenter x:Name="Icon"
+                                  Grid.Column="1"
+                                  Margin="0,0,6,0"
+                                  VerticalAlignment="Center"
+                                  KeyboardNavigation.IsTabStop="False"
+                                  Content="{TemplateBinding Icon}"
+                                  />
+
+                <ContentPresenter Grid.Column="2"
+                                  ContentSource="Header"
+                                  RecognizesAccessKey="True"
+                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                  />
+
+                <TextBlock x:Name="InputGestureText"
+                           Grid.Column="3"
+                           Margin="25,0,0,0"
+                           VerticalAlignment="Bottom"
+                           DockPanel.Dock="Right"
+                           FontSize="11"
+                           Foreground="{DynamicResource TextFillColorDisabledBrush}"
+                           Text="{TemplateBinding InputGestureText}"
+                           />
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="IsHighlighted" Value="True">
-                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}" />
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}"/>
             </Trigger>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="IsCheckable" Value="True">
-                <Setter TargetName="CheckBoxIconBorder" Property="Visibility" Value="Visible" />
+                <Setter TargetName="CheckBoxIconBorder" Property="Visibility" Value="Visible"/>
             </Trigger>
             <Trigger Property="IsChecked" Value="True">
-                <Setter TargetName="CheckBoxIcon" Property="Text" Value="&#xF294;" />
+                <Setter TargetName="CheckBoxIcon" Property="Text" Value="&#xF294;"/>
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
             <Trigger Property="InputGestureText" Value="">
-                <Setter TargetName="InputGestureText" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="InputGestureText" Property="Visibility" Value="Collapsed"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <!--  SubItem with Subitems  -->
-    <ControlTemplate x:Key="{x:Static MenuItem.SubmenuHeaderTemplateKey}" TargetType="{x:Type MenuItem}">
+    <ControlTemplate x:Key="{x:Static MenuItem.SubmenuHeaderTemplateKey}"
+                     TargetType="{x:Type MenuItem}"
+                     >
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
-            <Border
-                x:Name="Border"
-                Grid.Row="1"
-                Margin="4,1,4,1"
-                BorderThickness="1"
-                CornerRadius="4">
-                <Grid x:Name="MenuItemContent" Margin="8,6,8,6">
+            <Border x:Name="Border"
+                    Grid.Row="1"
+                    Margin="4,1,4,1"
+                    BorderThickness="1"
+                    CornerRadius="4"
+                    >
+                <Grid x:Name="MenuItemContent"
+                      Margin="8,6,8,6"
+                      >
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <ContentPresenter
-                        x:Name="Icon"
-                        Grid.Column="0"
-                        Margin="0,0,6,0"
-                        VerticalAlignment="Center"
-                        KeyboardNavigation.IsTabStop="False"
-                        Content="{TemplateBinding Icon}" />
-
-                    <ContentPresenter
-                        x:Name="HeaderHost"
-                        Grid.Column="1"
-                        ContentSource="Header"
-                        RecognizesAccessKey="True" />
+                    <ContentPresenter x:Name="Icon"
+                                      Grid.Column="0"
+                                      Margin="0,0,6,0"
+                                      VerticalAlignment="Center"
+                                      KeyboardNavigation.IsTabStop="False"
+                                      Content="{TemplateBinding Icon}"
+                                      />
+
+                    <ContentPresenter x:Name="HeaderHost"
+                                      Grid.Column="1"
+                                      ContentSource="Header"
+                                      RecognizesAccessKey="True"
+                                      />
 
                     <Grid Grid.Column="2">
-                        <controls:SymbolIcon
-                            x:Name="Chevron"
-                            Margin="0,3,0,0"
-                            VerticalAlignment="Center"
-                            FontSize="{TemplateBinding FontSize}"
-                            Symbol="ChevronRight20" />
+                        <controls:SymbolIcon x:Name="Chevron"
+                                             Margin="0,3,0,0"
+                                             VerticalAlignment="Center"
+                                             FontSize="{TemplateBinding FontSize}"
+                                             Symbol="ChevronRight20"
+                                             />
                     </Grid>
                 </Grid>
             </Border>
 
-            <Popup
-                x:Name="Popup"
-                Grid.Row="1"
-                AllowsTransparency="True"
-                Focusable="False"
-                IsOpen="{TemplateBinding IsSubmenuOpen}"
-                Placement="Right"
-                PlacementTarget="{Binding ElementName=MenuItemContent}"
-                PopupAnimation="None"
-                VerticalOffset="-20">
+            <Popup x:Name="Popup"
+                   Grid.Row="1"
+                   AllowsTransparency="True"
+                   Focusable="False"
+                   IsOpen="{TemplateBinding IsSubmenuOpen}"
+                   Placement="Right"
+                   PlacementTarget="{Binding ElementName=MenuItemContent}"
+                   PopupAnimation="None"
+                   VerticalOffset="-20"
+                   >
                 <Grid>
-                    <Border
-                        x:Name="SubmenuBorder"
-                        Margin="12,10,12,18"
-                        Padding="0,3,0,3"
-                        Background="{DynamicResource FlyoutBackground}"
-                        BorderBrush="{DynamicResource FlyoutBorderBrush}"
-                        BorderThickness="1"
-                        CornerRadius="8"
-                        SnapsToDevicePixels="True">
+                    <Border x:Name="SubmenuBorder"
+                            Margin="12,10,12,18"
+                            Padding="0,3,0,3"
+                            Background="{DynamicResource FlyoutBackground}"
+                            BorderBrush="{DynamicResource FlyoutBorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="8"
+                            SnapsToDevicePixels="True"
+                            >
                         <Border.RenderTransform>
-                            <TranslateTransform />
+                            <TranslateTransform/>
                         </Border.RenderTransform>
-                        <controls:PassiveScrollViewer CanContentScroll="True" Style="{StaticResource UiMenuItemScrollViewer}">
-                            <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+                        <controls:PassiveScrollViewer CanContentScroll="True"
+                                                      Style="{StaticResource UiMenuItemScrollViewer}"
+                                                      >
+                            <StackPanel IsItemsHost="True"
+                                        KeyboardNavigation.DirectionalNavigation="Cycle"
+                                        />
                         </controls:PassiveScrollViewer>
                         <Border.Effect>
-                            <DropShadowEffect
-                                BlurRadius="20"
-                                Direction="270"
-                                Opacity="0.5"
-                                ShadowDepth="6" />
+                            <DropShadowEffect BlurRadius="20"
+                                              Direction="270"
+                                              Opacity="0.5"
+                                              ShadowDepth="6"
+                                              />
                         </Border.Effect>
                     </Border>
                 </Grid>
@@ -376,11 +398,11 @@
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="Icon" Property="Margin" Value="0" />
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="Icon" Property="Margin" Value="0"/>
             </Trigger>
             <Trigger Property="IsHighlighted" Value="true">
-                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}" />
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}"/>
             </Trigger>
             <!--<Trigger SourceName="Popup" Property="AllowsTransparency" Value="True">
                 <Setter TargetName="SubmenuBorder" Property="CornerRadius" Value="4" />
@@ -389,12 +411,12 @@
             <Trigger Property="IsEnabled" Value="false">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}"/>
                     </Setter.Value>
                 </Setter>
                 <Setter TargetName="Chevron" Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -402,14 +424,14 @@
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="SubmenuBorder"
-                                Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
-                                From="-90"
-                                To="0"
-                                Duration="00:00:00.167">
+                            <DoubleAnimation Storyboard.TargetName="SubmenuBorder"
+                                             Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
+                                             From="-90"
+                                             To="0"
+                                             Duration="00:00:00.167"
+                                             >
                                 <DoubleAnimation.EasingFunction>
-                                    <CircleEase EasingMode="EaseOut" />
+                                    <CircleEase EasingMode="EaseOut"/>
                                 </DoubleAnimation.EasingFunction>
                             </DoubleAnimation>
                         </Storyboard>
@@ -419,109 +441,117 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="UiMenuItem" TargetType="{x:Type MenuItem}">
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
-        <Setter Property="Focusable" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="UiMenuItem"
+           TargetType="{x:Type MenuItem}"
+           >
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="True"/>
+        <Setter Property="Focusable" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Style.Triggers>
             <Trigger Property="Role" Value="TopLevelHeader">
-                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.TopLevelHeaderTemplateKey}}" />
-                <Setter Property="Grid.IsSharedSizeScope" Value="True" />
+                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.TopLevelHeaderTemplateKey}}"/>
+                <Setter Property="Grid.IsSharedSizeScope" Value="True"/>
             </Trigger>
             <Trigger Property="Role" Value="TopLevelItem">
-                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.TopLevelItemTemplateKey}}" />
+                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.TopLevelItemTemplateKey}}"/>
             </Trigger>
             <Trigger Property="Role" Value="SubmenuHeader">
-                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.SubmenuHeaderTemplateKey}}" />
+                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.SubmenuHeaderTemplateKey}}"/>
             </Trigger>
             <Trigger Property="Role" Value="SubmenuItem">
-                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.SubmenuItemTemplateKey}}" />
+                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.SubmenuItemTemplateKey}}"/>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style
-        x:Key="{x:Type MenuItem}"
-        BasedOn="{StaticResource UiMenuItem}"
-        TargetType="{x:Type MenuItem}" />
+    <Style x:Key="{x:Type MenuItem}"
+           BasedOn="{StaticResource UiMenuItem}"
+           TargetType="{x:Type MenuItem}"
+           />
 
     <!--
         WPF UI MENU ITEM
     -->
 
     <!--  TopLevelHeader  -->
-    <ControlTemplate x:Key="WpfUiMenuItemTopLevelHeaderTemplateKey" TargetType="{x:Type controls:MenuItem}">
-        <Border
-            x:Name="Border"
-            Margin="4"
-            Background="Transparent"
-            CornerRadius="6">
+    <ControlTemplate x:Key="WpfUiMenuItemTopLevelHeaderTemplateKey"
+                     TargetType="{x:Type controls:MenuItem}"
+                     >
+        <Border x:Name="Border"
+                Margin="4"
+                Background="Transparent"
+                CornerRadius="6"
+                >
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
 
                 <Grid Margin="10">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
-                    <ContentControl
-                        x:Name="IconElement"
-                        Grid.Column="0"
-                        Margin="0,0,6,0"
-                        VerticalAlignment="Center"
-                        KeyboardNavigation.IsTabStop="False"
-                        Content="{TemplateBinding Icon}"
-                        FontSize="{TemplateBinding FontSize}" />
-
-                    <ContentPresenter
-                        x:Name="HeaderPresenter"
-                        Grid.Column="2"
-                        VerticalAlignment="Center"
-                        ContentSource="Header"
-                        RecognizesAccessKey="True"
-                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                    <ContentControl x:Name="IconElement"
+                                    Grid.Column="0"
+                                    Margin="0,0,6,0"
+                                    VerticalAlignment="Center"
+                                    KeyboardNavigation.IsTabStop="False"
+                                    Content="{TemplateBinding Icon}"
+                                    FontSize="{TemplateBinding FontSize}"
+                                    />
+
+                    <ContentPresenter x:Name="HeaderPresenter"
+                                      Grid.Column="2"
+                                      VerticalAlignment="Center"
+                                      ContentSource="Header"
+                                      RecognizesAccessKey="True"
+                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                      />
                 </Grid>
 
-                <Popup
-                    x:Name="Popup"
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="2"
-                    AllowsTransparency="True"
-                    Focusable="False"
-                    HorizontalOffset="-12"
-                    IsOpen="{TemplateBinding IsSubmenuOpen}"
-                    Placement="Bottom"
-                    PlacementTarget="{Binding ElementName=Border}"
-                    PopupAnimation="None"
-                    VerticalOffset="1">
+                <Popup x:Name="Popup"
+                       Grid.Row="1"
+                       Grid.Column="0"
+                       Grid.ColumnSpan="2"
+                       AllowsTransparency="True"
+                       Focusable="False"
+                       HorizontalOffset="-12"
+                       IsOpen="{TemplateBinding IsSubmenuOpen}"
+                       Placement="Bottom"
+                       PlacementTarget="{Binding ElementName=Border}"
+                       PopupAnimation="None"
+                       VerticalOffset="1"
+                       >
                     <Grid>
-                        <Border
-                            x:Name="SubmenuBorder"
-                            Margin="12,0,12,18"
-                            Padding="0,3,0,3"
-                            Background="{DynamicResource FlyoutBackground}"
-                            BorderBrush="{DynamicResource FlyoutBorderBrush}"
-                            BorderThickness="1"
-                            CornerRadius="8"
-                            SnapsToDevicePixels="True">
+                        <Border x:Name="SubmenuBorder"
+                                Margin="12,0,12,18"
+                                Padding="0,3,0,3"
+                                Background="{DynamicResource FlyoutBackground}"
+                                BorderBrush="{DynamicResource FlyoutBorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="8"
+                                SnapsToDevicePixels="True"
+                                >
                             <Border.RenderTransform>
-                                <TranslateTransform />
+                                <TranslateTransform/>
                             </Border.RenderTransform>
-                            <controls:PassiveScrollViewer CanContentScroll="True" Style="{StaticResource UiMenuItemScrollViewer}">
-                                <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+                            <controls:PassiveScrollViewer CanContentScroll="True"
+                                                          Style="{StaticResource UiMenuItemScrollViewer}"
+                                                          >
+                                <StackPanel IsItemsHost="True"
+                                            KeyboardNavigation.DirectionalNavigation="Cycle"
+                                            />
                             </controls:PassiveScrollViewer>
                             <Border.Effect>
-                                <DropShadowEffect
-                                    BlurRadius="20"
-                                    Direction="270"
-                                    Opacity="0.25"
-                                    ShadowDepth="6" />
+                                <DropShadowEffect BlurRadius="20"
+                                                  Direction="270"
+                                                  Opacity="0.25"
+                                                  ShadowDepth="6"
+                                                  />
                             </Border.Effect>
                         </Border>
                     </Grid>
@@ -530,20 +560,20 @@
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="IconElement" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="IconElement" Property="Margin" Value="0" />
+                <Setter TargetName="IconElement" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="IconElement" Property="Margin" Value="0"/>
             </Trigger>
             <Trigger Property="Header" Value="{x:Null}">
-                <Setter TargetName="IconElement" Property="Margin" Value="0" />
-                <Setter TargetName="HeaderPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="IconElement" Property="Margin" Value="0"/>
+                <Setter TargetName="HeaderPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="IsHighlighted" Value="True">
-                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}" />
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}"/>
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -551,14 +581,14 @@
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="SubmenuBorder"
-                                Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
-                                From="-90"
-                                To="0"
-                                Duration="00:00:00.167">
+                            <DoubleAnimation Storyboard.TargetName="SubmenuBorder"
+                                             Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
+                                             From="-90"
+                                             To="0"
+                                             Duration="00:00:00.167"
+                                             >
                                 <DoubleAnimation.EasingFunction>
-                                    <CircleEase EasingMode="EaseOut" />
+                                    <CircleEase EasingMode="EaseOut"/>
                                 </DoubleAnimation.EasingFunction>
                             </DoubleAnimation>
                         </Storyboard>
@@ -569,53 +599,55 @@
     </ControlTemplate>
 
     <!--  TopLevelItem  -->
-    <ControlTemplate x:Key="WpfUiMenuItemTopLevelItemTemplateKey" TargetType="{x:Type controls:MenuItem}">
-        <Border
-            x:Name="Border"
-            Margin="4"
-            Background="Transparent"
-            CornerRadius="6">
+    <ControlTemplate x:Key="WpfUiMenuItemTopLevelItemTemplateKey"
+                     TargetType="{x:Type controls:MenuItem}"
+                     >
+        <Border x:Name="Border"
+                Margin="4"
+                Background="Transparent"
+                CornerRadius="6"
+                >
             <Grid Margin="10">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
 
-                <ContentControl
-                    x:Name="IconElement"
-                    Grid.Column="0"
-                    Margin="0,0,6,0"
-                    VerticalAlignment="Center"
-                    KeyboardNavigation.IsTabStop="False"
-                    Content="{TemplateBinding Icon}"
-                    FontSize="{TemplateBinding FontSize}" />
-
-                <ContentPresenter
-                    x:Name="HeaderPresenter"
-                    Grid.Column="2"
-                    VerticalAlignment="Center"
-                    ContentSource="Header"
-                    RecognizesAccessKey="True"
-                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                <ContentControl x:Name="IconElement"
+                                Grid.Column="0"
+                                Margin="0,0,6,0"
+                                VerticalAlignment="Center"
+                                KeyboardNavigation.IsTabStop="False"
+                                Content="{TemplateBinding Icon}"
+                                FontSize="{TemplateBinding FontSize}"
+                                />
+
+                <ContentPresenter x:Name="HeaderPresenter"
+                                  Grid.Column="2"
+                                  VerticalAlignment="Center"
+                                  ContentSource="Header"
+                                  RecognizesAccessKey="True"
+                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                  />
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="IsHighlighted" Value="True">
-                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}" />
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}"/>
             </Trigger>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="IconElement" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="IconElement" Property="Margin" Value="0" />
+                <Setter TargetName="IconElement" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="IconElement" Property="Margin" Value="0"/>
             </Trigger>
             <Trigger Property="Header" Value="{x:Null}">
-                <Setter TargetName="IconElement" Property="Margin" Value="0" />
-                <Setter TargetName="HeaderPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="IconElement" Property="Margin" Value="0"/>
+                <Setter TargetName="HeaderPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -623,177 +655,189 @@
     </ControlTemplate>
 
     <!--  SubmenuItem  -->
-    <ControlTemplate x:Key="WpfUiMenuItemSubmenuItemTemplateKey" TargetType="{x:Type controls:MenuItem}">
-        <Border
-            x:Name="Border"
-            Margin="4,1,4,1"
-            Background="Transparent"
-            CornerRadius="4">
+    <ControlTemplate x:Key="WpfUiMenuItemSubmenuItemTemplateKey"
+                     TargetType="{x:Type controls:MenuItem}"
+                     >
+        <Border x:Name="Border"
+                Margin="4,1,4,1"
+                Background="Transparent"
+                CornerRadius="4"
+                >
             <Grid Margin="8,6,8,6">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"
+                                      SharedSizeGroup="Shortcut"
+                                      />
                 </Grid.ColumnDefinitions>
 
-                <Border
-                    x:Name="CheckBoxIconBorder"
-                    Grid.Column="0"
-                    Width="20"
-                    Height="20"
-                    Margin="0"
-                    VerticalAlignment="Center"
-                    Background="{DynamicResource CheckBoxBackground}"
-                    BorderBrush="{DynamicResource CheckBoxBorderBrush}"
-                    BorderThickness="1"
-                    CornerRadius="4"
-                    Visibility="Collapsed">
-                    <TextBlock
-                        x:Name="CheckBoxIcon"
-                        HorizontalAlignment="Center"
+                <Border x:Name="CheckBoxIconBorder"
+                        Grid.Column="0"
+                        Width="20"
+                        Height="20"
+                        Margin="0"
                         VerticalAlignment="Center"
-                        FontFamily="{DynamicResource FluentSystemIcons}"
-                        FontSize="16"
-                        Text=""
-                        TextAlignment="Center" />
+                        Background="{DynamicResource CheckBoxBackground}"
+                        BorderBrush="{DynamicResource CheckBoxBorderBrush}"
+                        BorderThickness="1"
+                        CornerRadius="4"
+                        Visibility="Collapsed"
+                        >
+                    <TextBlock x:Name="CheckBoxIcon"
+                               HorizontalAlignment="Center"
+                               VerticalAlignment="Center"
+                               FontFamily="{DynamicResource FluentSystemIcons}"
+                               FontSize="16"
+                               Text=""
+                               TextAlignment="Center"
+                               />
                 </Border>
 
-                <ContentControl
-                    x:Name="IconElement"
-                    Grid.Column="1"
-                    Margin="0,0,6,0"
-                    VerticalAlignment="Center"
-                    KeyboardNavigation.IsTabStop="False"
-                    Content="{TemplateBinding Icon}"
-                    FontSize="16" />
-
-                <ContentPresenter
-                    Grid.Column="3"
-                    ContentSource="Header"
-                    RecognizesAccessKey="True"
-                    TextElement.Foreground="{TemplateBinding Foreground}" />
-
-                <TextBlock
-                    x:Name="InputGestureText"
-                    Grid.Column="4"
-                    Margin="25,0,0,0"
-                    VerticalAlignment="Bottom"
-                    DockPanel.Dock="Right"
-                    FontSize="11"
-                    Foreground="{DynamicResource TextFillColorDisabledBrush}"
-                    Text="{TemplateBinding InputGestureText}" />
+                <ContentControl x:Name="IconElement"
+                                Grid.Column="1"
+                                Margin="0,0,6,0"
+                                VerticalAlignment="Center"
+                                KeyboardNavigation.IsTabStop="False"
+                                Content="{TemplateBinding Icon}"
+                                FontSize="16"
+                                />
+
+                <ContentPresenter Grid.Column="3"
+                                  ContentSource="Header"
+                                  RecognizesAccessKey="True"
+                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                  />
+
+                <TextBlock x:Name="InputGestureText"
+                           Grid.Column="4"
+                           Margin="25,0,0,0"
+                           VerticalAlignment="Bottom"
+                           DockPanel.Dock="Right"
+                           FontSize="11"
+                           Foreground="{DynamicResource TextFillColorDisabledBrush}"
+                           Text="{TemplateBinding InputGestureText}"
+                           />
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="IsHighlighted" Value="True">
-                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}" />
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}"/>
             </Trigger>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="IconElement" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="IconElement" Property="Margin" Value="0" />
+                <Setter TargetName="IconElement" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="IconElement" Property="Margin" Value="0"/>
             </Trigger>
             <Trigger Property="IsCheckable" Value="True">
-                <Setter TargetName="CheckBoxIconBorder" Property="Visibility" Value="Visible" />
-                <Setter TargetName="CheckBoxIconBorder" Property="Margin" Value="0,0,6,0" />
+                <Setter TargetName="CheckBoxIconBorder" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="CheckBoxIconBorder" Property="Margin" Value="0,0,6,0"/>
             </Trigger>
             <Trigger Property="IsChecked" Value="True">
-                <Setter TargetName="CheckBoxIcon" Property="Text" Value="&#xF294;" />
+                <Setter TargetName="CheckBoxIcon" Property="Text" Value="&#xF294;"/>
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
             <Trigger Property="InputGestureText" Value="">
-                <Setter TargetName="InputGestureText" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="InputGestureText" Property="Visibility" Value="Collapsed"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <!--  SubItem with Subitems  -->
-    <ControlTemplate x:Key="WpfUiMenuItemSubmenuHeaderTemplateKey" TargetType="{x:Type controls:MenuItem}">
+    <ControlTemplate x:Key="WpfUiMenuItemSubmenuHeaderTemplateKey"
+                     TargetType="{x:Type controls:MenuItem}"
+                     >
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
-            <Border
-                x:Name="Border"
-                Grid.Row="1"
-                Margin="4,1,4,1"
-                BorderThickness="1"
-                CornerRadius="4">
-                <Grid x:Name="MenuItemContent" Margin="8,6,8,6">
+            <Border x:Name="Border"
+                    Grid.Row="1"
+                    Margin="4,1,4,1"
+                    BorderThickness="1"
+                    CornerRadius="4"
+                    >
+                <Grid x:Name="MenuItemContent"
+                      Margin="8,6,8,6"
+                      >
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
-                    <ContentControl
-                        x:Name="IconElement"
-                        Grid.Column="0"
-                        Margin="0,0,6,0"
-                        VerticalAlignment="Center"
-                        KeyboardNavigation.IsTabStop="False"
-                        Content="{TemplateBinding Icon}"
-                        FontSize="16" />
-
-                    <ContentPresenter
-                        x:Name="HeaderHost"
-                        Grid.Column="2"
-                        ContentSource="Header"
-                        RecognizesAccessKey="True" />
+                    <ContentControl x:Name="IconElement"
+                                    Grid.Column="0"
+                                    Margin="0,0,6,0"
+                                    VerticalAlignment="Center"
+                                    KeyboardNavigation.IsTabStop="False"
+                                    Content="{TemplateBinding Icon}"
+                                    FontSize="16"
+                                    />
+
+                    <ContentPresenter x:Name="HeaderHost"
+                                      Grid.Column="2"
+                                      ContentSource="Header"
+                                      RecognizesAccessKey="True"
+                                      />
 
                     <Grid Grid.Column="3">
-                        <controls:SymbolIcon
-                            x:Name="Chevron"
-                            Margin="0,3,0,0"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Symbol="ChevronRight20" />
+                        <controls:SymbolIcon x:Name="Chevron"
+                                             Margin="0,3,0,0"
+                                             VerticalAlignment="Center"
+                                             FontSize="14"
+                                             Symbol="ChevronRight20"
+                                             />
                     </Grid>
                 </Grid>
             </Border>
 
-            <Popup
-                x:Name="Popup"
-                Grid.Row="1"
-                AllowsTransparency="True"
-                Focusable="False"
-                IsOpen="{TemplateBinding IsSubmenuOpen}"
-                Placement="Right"
-                PlacementTarget="{Binding ElementName=MenuItemContent}"
-                PopupAnimation="None"
-                VerticalOffset="-20">
+            <Popup x:Name="Popup"
+                   Grid.Row="1"
+                   AllowsTransparency="True"
+                   Focusable="False"
+                   IsOpen="{TemplateBinding IsSubmenuOpen}"
+                   Placement="Right"
+                   PlacementTarget="{Binding ElementName=MenuItemContent}"
+                   PopupAnimation="None"
+                   VerticalOffset="-20"
+                   >
                 <Grid>
-                    <Border
-                        x:Name="SubmenuBorder"
-                        Margin="12,10,12,18"
-                        Padding="0,3,0,3"
-                        Background="{DynamicResource FlyoutBackground}"
-                        BorderBrush="{DynamicResource FlyoutBorderBrush}"
-                        BorderThickness="1"
-                        CornerRadius="8"
-                        SnapsToDevicePixels="True">
+                    <Border x:Name="SubmenuBorder"
+                            Margin="12,10,12,18"
+                            Padding="0,3,0,3"
+                            Background="{DynamicResource FlyoutBackground}"
+                            BorderBrush="{DynamicResource FlyoutBorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="8"
+                            SnapsToDevicePixels="True"
+                            >
                         <Border.RenderTransform>
-                            <TranslateTransform />
+                            <TranslateTransform/>
                         </Border.RenderTransform>
-                        <controls:PassiveScrollViewer CanContentScroll="True" Style="{StaticResource UiMenuItemScrollViewer}">
-                            <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+                        <controls:PassiveScrollViewer CanContentScroll="True"
+                                                      Style="{StaticResource UiMenuItemScrollViewer}"
+                                                      >
+                            <StackPanel IsItemsHost="True"
+                                        KeyboardNavigation.DirectionalNavigation="Cycle"
+                                        />
                         </controls:PassiveScrollViewer>
                         <Border.Effect>
-                            <DropShadowEffect
-                                BlurRadius="20"
-                                Direction="270"
-                                Opacity="0.5"
-                                ShadowDepth="6" />
+                            <DropShadowEffect BlurRadius="20"
+                                              Direction="270"
+                                              Opacity="0.5"
+                                              ShadowDepth="6"
+                                              />
                         </Border.Effect>
                     </Border>
                 </Grid>
@@ -801,11 +845,11 @@
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="IconElement" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="IconElement" Property="Margin" Value="0" />
+                <Setter TargetName="IconElement" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="IconElement" Property="Margin" Value="0"/>
             </Trigger>
             <Trigger Property="IsHighlighted" Value="true">
-                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}" />
+                <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}"/>
             </Trigger>
             <!--<Trigger SourceName="Popup" Property="AllowsTransparency" Value="True">
                 <Setter TargetName="SubmenuBorder" Property="CornerRadius" Value="4" />
@@ -814,12 +858,12 @@
             <Trigger Property="IsEnabled" Value="false">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}"/>
                     </Setter.Value>
                 </Setter>
                 <Setter TargetName="Chevron" Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}" />
+                        <SolidColorBrush Color="{DynamicResource TextFillColorDisabled}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -827,14 +871,14 @@
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="SubmenuBorder"
-                                Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
-                                From="-90"
-                                To="0"
-                                Duration="00:00:00.167">
+                            <DoubleAnimation Storyboard.TargetName="SubmenuBorder"
+                                             Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
+                                             From="-90"
+                                             To="0"
+                                             Duration="00:00:00.167"
+                                             >
                                 <DoubleAnimation.EasingFunction>
-                                    <CircleEase EasingMode="EaseOut" />
+                                    <CircleEase EasingMode="EaseOut"/>
                                 </DoubleAnimation.EasingFunction>
                             </DoubleAnimation>
                         </Storyboard>
@@ -845,28 +889,32 @@
     </ControlTemplate>
 
     <!--  MenuItem Style  -->
-    <Style x:Key="WpfUiMenuItem" TargetType="{x:Type controls:MenuItem}">
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
-        <Setter Property="Focusable" Value="True" />
+    <Style x:Key="WpfUiMenuItem"
+           TargetType="{x:Type controls:MenuItem}"
+           >
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="True"/>
+        <Setter Property="Focusable" Value="True"/>
         <Style.Triggers>
             <Trigger Property="Role" Value="TopLevelHeader">
-                <Setter Property="Template" Value="{StaticResource WpfUiMenuItemTopLevelHeaderTemplateKey}" />
-                <Setter Property="Grid.IsSharedSizeScope" Value="True" />
+                <Setter Property="Template" Value="{StaticResource WpfUiMenuItemTopLevelHeaderTemplateKey}"/>
+                <Setter Property="Grid.IsSharedSizeScope" Value="True"/>
             </Trigger>
             <Trigger Property="Role" Value="TopLevelItem">
-                <Setter Property="Template" Value="{StaticResource WpfUiMenuItemTopLevelItemTemplateKey}" />
+                <Setter Property="Template" Value="{StaticResource WpfUiMenuItemTopLevelItemTemplateKey}"/>
             </Trigger>
             <Trigger Property="Role" Value="SubmenuHeader">
-                <Setter Property="Template" Value="{StaticResource WpfUiMenuItemSubmenuHeaderTemplateKey}" />
+                <Setter Property="Template" Value="{StaticResource WpfUiMenuItemSubmenuHeaderTemplateKey}"/>
             </Trigger>
             <Trigger Property="Role" Value="SubmenuItem">
-                <Setter Property="Template" Value="{StaticResource WpfUiMenuItemSubmenuItemTemplateKey}" />
+                <Setter Property="Template" Value="{StaticResource WpfUiMenuItemSubmenuItemTemplateKey}"/>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource WpfUiMenuItem}" TargetType="{x:Type controls:MenuItem}" />
+    <Style BasedOn="{StaticResource WpfUiMenuItem}"
+           TargetType="{x:Type controls:MenuItem}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/Menu/MenuLoader.xaml b/src/Wpf.Ui/Controls/Menu/MenuLoader.xaml
index ee64cc06f..0afb2419b 100644
--- a/src/Wpf.Ui/Controls/Menu/MenuLoader.xaml
+++ b/src/Wpf.Ui/Controls/Menu/MenuLoader.xaml
@@ -5,8 +5,8 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    x:Class="Wpf.Ui.Controls.MenuLoader"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls" />
+<ResourceDictionary x:Class="Wpf.Ui.Controls.MenuLoader"
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    />
diff --git a/src/Wpf.Ui/Controls/MessageBox/MessageBox.xaml b/src/Wpf.Ui/Controls/MessageBox/MessageBox.xaml
index aaeb848d6..cc034ad59 100644
--- a/src/Wpf.Ui/Controls/MessageBox/MessageBox.xaml
+++ b/src/Wpf.Ui/Controls/MessageBox/MessageBox.xaml
@@ -5,40 +5,40 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Style TargetType="{x:Type controls:MessageBox}">
-        <Setter Property="MaxWidth" Value="450" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Background" Value="{DynamicResource MessageBoxBackground}" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="{DynamicResource MessageBoxForeground}" />
-        <Setter Property="TextElement.FontWeight" Value="Regular" />
-        <Setter Property="WindowStyle" Value="ToolWindow" />
-        <Setter Property="ShowInTaskbar" Value="False" />
+        <Setter Property="MaxWidth" Value="450"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Background" Value="{DynamicResource MessageBoxBackground}"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Foreground" Value="{DynamicResource MessageBoxForeground}"/>
+        <Setter Property="TextElement.FontWeight" Value="Regular"/>
+        <Setter Property="WindowStyle" Value="ToolWindow"/>
+        <Setter Property="ShowInTaskbar" Value="False"/>
         <!--<Setter Property="AllowsTransparency" Value="False" />-->
-        <Setter Property="RenderOptions.BitmapScalingMode" Value="Fant" />
-        <Setter Property="ResizeMode" Value="NoResize" />
-        <Setter Property="WindowState" Value="Normal" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="RenderOptions.BitmapScalingMode" Value="Fant"/>
+        <Setter Property="ResizeMode" Value="NoResize"/>
+        <Setter Property="WindowState" Value="Normal"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="WindowChrome.WindowChrome">
             <Setter.Value>
                 <!--
                     CaptionHeight removes the white block at the top of the application window.
                     GlassFrameThickness must be at least -1, otherwise the transparency for Mica will not work.
                 -->
-                <WindowChrome
-                    CaptionHeight="1"
-                    CornerRadius="0"
-                    GlassFrameThickness="-1"
-                    NonClientFrameEdges="None"
-                    ResizeBorderThickness="0"
-                    ResizeGripDirection="None"
-                    UseAeroCaptionButtons="False" />
+                <WindowChrome CaptionHeight="1"
+                              CornerRadius="0"
+                              GlassFrameThickness="-1"
+                              NonClientFrameEdges="None"
+                              ResizeBorderThickness="0"
+                              ResizeGripDirection="None"
+                              UseAeroCaptionButtons="False"
+                              />
             </Setter.Value>
         </Setter>
         <Setter Property="Template">
@@ -48,82 +48,96 @@
                         <AdornerDecorator>
                             <Grid>
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
-                                <Border Grid.RowSpan="2" Background="{DynamicResource MessageBoxTopOverlay}" />
-                                <TextBlock
-                                    x:Name="Title"
-                                    Grid.Row="0"
-                                    Margin="12,12,12,0"
-                                    FontWeight="SemiBold"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    Text="{TemplateBinding Title}" />
+                                <Border Grid.RowSpan="2"
+                                        Background="{DynamicResource MessageBoxTopOverlay}"
+                                        />
+                                <TextBlock x:Name="Title"
+                                           Grid.Row="0"
+                                           Margin="12,12,12,0"
+                                           FontWeight="SemiBold"
+                                           Foreground="{TemplateBinding Foreground}"
+                                           Text="{TemplateBinding Title}"
+                                           />
 
-                                <controls:TitleBar
-                                    Grid.Row="0"
-                                    ForceShutdown="False"
-                                    ShowMaximize="False"
-                                    ShowMinimize="False" />
+                                <controls:TitleBar Grid.Row="0"
+                                                   ForceShutdown="False"
+                                                   ShowMaximize="False"
+                                                   ShowMinimize="False"
+                                                   />
 
-                                <ContentPresenter
-                                    x:Name="ContentPresenter"
-                                    Grid.Row="1"
-                                    Margin="12,10,12,12"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}">
+                                <ContentPresenter x:Name="ContentPresenter"
+                                                  Grid.Row="1"
+                                                  Margin="12,10,12,12"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  >
                                     <ContentPresenter.Resources>
-                                        <Style BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="{x:Type TextBlock}">
-                                            <Setter Property="TextWrapping" Value="WrapWithOverflow" />
-                                            <Setter Property="TextAlignment" Value="Justify" />
+                                        <Style BasedOn="{StaticResource {x:Type TextBlock}}"
+                                               TargetType="{x:Type TextBlock}"
+                                               >
+                                            <Setter Property="TextWrapping" Value="WrapWithOverflow"/>
+                                            <Setter Property="TextAlignment" Value="Justify"/>
                                         </Style>
                                     </ContentPresenter.Resources>
                                 </ContentPresenter>
 
-                                <Border
-                                    Grid.Row="2"
-                                    Padding="12"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Bottom"
-                                    BorderBrush="{DynamicResource MessageBoxSeparatorBorderBrush}"
-                                    BorderThickness="0,1,0,0"
-                                    CornerRadius="0">
+                                <Border Grid.Row="2"
+                                        Padding="12"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Bottom"
+                                        BorderBrush="{DynamicResource MessageBoxSeparatorBorderBrush}"
+                                        BorderThickness="0,1,0,0"
+                                        CornerRadius="0"
+                                        >
                                     <Grid>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition x:Name="PrimaryColumn" Width="*" />
-                                            <ColumnDefinition x:Name="FirstSpacer" Width="8" />
-                                            <ColumnDefinition x:Name="SecondaryColumn" Width="*" />
-                                            <ColumnDefinition x:Name="SecondSpacer" Width="8" />
-                                            <ColumnDefinition x:Name="CloseColumn" Width="*" />
+                                            <ColumnDefinition x:Name="PrimaryColumn"
+                                                              Width="*"
+                                                              />
+                                            <ColumnDefinition x:Name="FirstSpacer"
+                                                              Width="8"
+                                                              />
+                                            <ColumnDefinition x:Name="SecondaryColumn"
+                                                              Width="*"
+                                                              />
+                                            <ColumnDefinition x:Name="SecondSpacer"
+                                                              Width="8"
+                                                              />
+                                            <ColumnDefinition x:Name="CloseColumn"
+                                                              Width="*"
+                                                              />
                                         </Grid.ColumnDefinitions>
 
-                                        <controls:Button
-                                            Grid.Column="0"
-                                            HorizontalAlignment="Stretch"
-                                            Appearance="{TemplateBinding PrimaryButtonAppearance}"
-                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:MessageBox}}, Path=TemplateButtonCommand, Mode=OneTime}"
-                                            CommandParameter="{x:Static controls:MessageBoxButton.Primary}"
-                                            Content="{TemplateBinding PrimaryButtonText}"
-                                            IsDefault="True" />
+                                        <controls:Button Grid.Column="0"
+                                                         HorizontalAlignment="Stretch"
+                                                         Appearance="{TemplateBinding PrimaryButtonAppearance}"
+                                                         Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:MessageBox}}, Path=TemplateButtonCommand, Mode=OneTime}"
+                                                         CommandParameter="{x:Static controls:MessageBoxButton.Primary}"
+                                                         Content="{TemplateBinding PrimaryButtonText}"
+                                                         IsDefault="True"
+                                                         />
 
-                                        <controls:Button
-                                            Grid.Column="2"
-                                            HorizontalAlignment="Stretch"
-                                            Appearance="{TemplateBinding SecondaryButtonAppearance}"
-                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:MessageBox}}, Path=TemplateButtonCommand, Mode=OneTime}"
-                                            CommandParameter="{x:Static controls:MessageBoxButton.Secondary}"
-                                            Content="{TemplateBinding SecondaryButtonText}" />
+                                        <controls:Button Grid.Column="2"
+                                                         HorizontalAlignment="Stretch"
+                                                         Appearance="{TemplateBinding SecondaryButtonAppearance}"
+                                                         Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:MessageBox}}, Path=TemplateButtonCommand, Mode=OneTime}"
+                                                         CommandParameter="{x:Static controls:MessageBoxButton.Secondary}"
+                                                         Content="{TemplateBinding SecondaryButtonText}"
+                                                         />
 
-                                        <controls:Button
-                                            Grid.Column="4"
-                                            HorizontalAlignment="Stretch"
-                                            Appearance="{TemplateBinding CloseButtonAppearance}"
-                                            Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:MessageBox}}, Path=TemplateButtonCommand, Mode=OneTime}"
-                                            CommandParameter="{x:Static controls:MessageBoxButton.Close}"
-                                            Content="{TemplateBinding CloseButtonText}"
-                                            IsCancel="True" />
+                                        <controls:Button Grid.Column="4"
+                                                         HorizontalAlignment="Stretch"
+                                                         Appearance="{TemplateBinding CloseButtonAppearance}"
+                                                         Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:MessageBox}}, Path=TemplateButtonCommand, Mode=OneTime}"
+                                                         CommandParameter="{x:Static controls:MessageBoxButton.Close}"
+                                                         Content="{TemplateBinding CloseButtonText}"
+                                                         IsCancel="True"
+                                                         />
                                     </Grid>
                                 </Border>
                             </Grid>
@@ -131,29 +145,29 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="WindowState" Value="Maximized">
-                            <Setter TargetName="ContentPresenter" Property="Margin" Value="8" />
+                            <Setter TargetName="ContentPresenter" Property="Margin" Value="8"/>
                         </Trigger>
                         <Trigger Property="IsPrimaryButtonEnabled" Value="False">
-                            <Setter TargetName="PrimaryColumn" Property="Width" Value="0" />
+                            <Setter TargetName="PrimaryColumn" Property="Width" Value="0"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsPrimaryButtonEnabled" Value="False" />
-                                <Condition Property="IsSecondaryButtonEnabled" Value="False" />
+                                <Condition Property="IsPrimaryButtonEnabled" Value="False"/>
+                                <Condition Property="IsSecondaryButtonEnabled" Value="False"/>
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="SecondSpacer" Property="Width" Value="0" />
+                                <Setter TargetName="SecondSpacer" Property="Width" Value="0"/>
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                         <Trigger Property="IsSecondaryButtonEnabled" Value="False">
-                            <Setter TargetName="FirstSpacer" Property="Width" Value="0" />
-                            <Setter TargetName="SecondaryColumn" Property="Width" Value="0" />
+                            <Setter TargetName="FirstSpacer" Property="Width" Value="0"/>
+                            <Setter TargetName="SecondaryColumn" Property="Width" Value="0"/>
                         </Trigger>
                         <Trigger Property="PrimaryButtonText" Value="">
-                            <Setter Property="IsPrimaryButtonEnabled" Value="False" />
+                            <Setter Property="IsPrimaryButtonEnabled" Value="False"/>
                         </Trigger>
                         <Trigger Property="SecondaryButtonText" Value="">
-                            <Setter Property="IsSecondaryButtonEnabled" Value="False" />
+                            <Setter Property="IsSecondaryButtonEnabled" Value="False"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -161,8 +175,8 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="WindowState" Value="Maximized">
-                <Setter Property="BorderThickness" Value="6,6,6,0" />
-                <Setter Property="Topmost" Value="False" />
+                <Setter Property="BorderThickness" Value="6,6,6,0"/>
+                <Setter Property="Topmost" Value="False"/>
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationLeftFluent.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationLeftFluent.xaml
index c0b6265d6..b82cebad3 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationLeftFluent.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationLeftFluent.xaml
@@ -1,145 +1,149 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewConstants.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewConstants.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <ControlTemplate x:Key="LeftFluentNavigationViewItemTemplate" TargetType="{x:Type controls:NavigationViewItem}">
-        <Border
-            x:Name="MainBorder"
-            Width="{StaticResource PaneFluentButtonWidth}"
-            Height="{StaticResource PaneFluentButtonHeight}"
-            Padding="4"
-            HorizontalAlignment="Stretch"
-            Background="Transparent"
-            BorderBrush="{TemplateBinding BorderBrush}"
-            BorderThickness="1"
-            CornerRadius="4">
+    <ControlTemplate x:Key="LeftFluentNavigationViewItemTemplate"
+                     TargetType="{x:Type controls:NavigationViewItem}"
+                     >
+        <Border x:Name="MainBorder"
+                Width="{StaticResource PaneFluentButtonWidth}"
+                Height="{StaticResource PaneFluentButtonHeight}"
+                Padding="4"
+                HorizontalAlignment="Stretch"
+                Background="Transparent"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="1"
+                CornerRadius="4"
+                >
             <Grid>
-                <Rectangle
-                    x:Name="ActiveRectangle"
-                    Width="3"
-                    Height="24"
-                    Margin="-4,0,0,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
-                    Opacity="0.0"
-                    RadiusX="2"
-                    RadiusY="2" />
+                <Rectangle x:Name="ActiveRectangle"
+                           Width="3"
+                           Height="24"
+                           Margin="-4,0,0,0"
+                           HorizontalAlignment="Left"
+                           VerticalAlignment="Center"
+                           Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
+                           Opacity="0.0"
+                           RadiusX="2"
+                           RadiusY="2"
+                           />
 
-                <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                <Grid HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      >
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
 
-                    <ContentPresenter
-                        x:Name="IconContentPresenter"
-                        Grid.Row="0"
-                        Margin="0"
-                        Content="{TemplateBinding Icon}"
-                        TextElement.FontSize="{StaticResource NavigationViewFluentIconSize}"
-                        TextElement.Foreground="{DynamicResource NavigationViewItemForegroundLeftFluent}" />
+                    <ContentPresenter x:Name="IconContentPresenter"
+                                      Grid.Row="0"
+                                      Margin="0"
+                                      Content="{TemplateBinding Icon}"
+                                      TextElement.FontSize="{StaticResource NavigationViewFluentIconSize}"
+                                      TextElement.Foreground="{DynamicResource NavigationViewItemForegroundLeftFluent}"
+                                      />
 
-                    <Grid
-                        x:Name="ContentGrid"
-                        Grid.Row="1"
-                        Height="{StaticResource NavigationViewFluentIconSize}"
-                        Margin="0,2,0,0">
-                        <ContentPresenter
-                            x:Name="ElementContentPresenter"
-                            HorizontalAlignment="Center"
-                            Content="{TemplateBinding Content}"
-                            TextElement.FontSize="{TemplateBinding FontSize}"
-                            TextElement.Foreground="{DynamicResource NavigationViewItemForegroundLeftFluent}" />
+                    <Grid x:Name="ContentGrid"
+                          Grid.Row="1"
+                          Height="{StaticResource NavigationViewFluentIconSize}"
+                          Margin="0,2,0,0"
+                          >
+                        <ContentPresenter x:Name="ElementContentPresenter"
+                                          HorizontalAlignment="Center"
+                                          Content="{TemplateBinding Content}"
+                                          TextElement.FontSize="{TemplateBinding FontSize}"
+                                          TextElement.Foreground="{DynamicResource NavigationViewItemForegroundLeftFluent}"
+                                          />
                     </Grid>
 
-                    <ContentPresenter
-                        x:Name="PART_InfoBadge"
-                        Grid.Row="0"
-                        Margin="0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        Content="{TemplateBinding InfoBadge}" />
+                    <ContentPresenter x:Name="PART_InfoBadge"
+                                      Grid.Row="0"
+                                      Margin="0"
+                                      HorizontalAlignment="Right"
+                                      VerticalAlignment="Top"
+                                      Content="{TemplateBinding InfoBadge}"
+                                      />
                 </Grid>
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="IsActive" Value="True">
-                <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
-                <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelectedLeftFluent}" />
-                <Setter TargetName="IconContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewSelectionIndicatorForeground}" />
-                <Setter TargetName="ElementContentPresenter" Property="Margin" Value="0" />
+                <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0"/>
+                <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelectedLeftFluent}"/>
+                <Setter TargetName="IconContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewSelectionIndicatorForeground}"/>
+                <Setter TargetName="ElementContentPresenter" Property="Margin" Value="0"/>
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="ContentGrid"
-                                Storyboard.TargetProperty="Height"
-                                From="{StaticResource NavigationViewFluentIconSize}"
-                                To="0"
-                                Duration="0:0:.16" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="ContentGrid"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1"
-                                To="0"
-                                Duration="0:0:.16" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="MainBorder"
-                                Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Opacity)"
-                                From="0"
-                                To="1"
-                                Duration="0:0:.16" />
+                            <DoubleAnimation Storyboard.TargetName="ContentGrid"
+                                             Storyboard.TargetProperty="Height"
+                                             From="{StaticResource NavigationViewFluentIconSize}"
+                                             To="0"
+                                             Duration="0:0:.16"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="ContentGrid"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1"
+                                             To="0"
+                                             Duration="0:0:.16"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="MainBorder"
+                                             Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Opacity)"
+                                             From="0"
+                                             To="1"
+                                             Duration="0:0:.16"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="ContentGrid"
-                                Storyboard.TargetProperty="Height"
-                                From="0"
-                                To="{StaticResource NavigationViewFluentIconSize}"
-                                Duration="0:0:.16" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="ContentGrid"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0"
-                                To="1"
-                                Duration="0:0:.16" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="MainBorder"
-                                Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Opacity)"
-                                From="1"
-                                To="0"
-                                Duration="0:0:.16" />
+                            <DoubleAnimation Storyboard.TargetName="ContentGrid"
+                                             Storyboard.TargetProperty="Height"
+                                             From="0"
+                                             To="{StaticResource NavigationViewFluentIconSize}"
+                                             Duration="0:0:.16"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="ContentGrid"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0"
+                                             To="1"
+                                             Duration="0:0:.16"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="MainBorder"
+                                             Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Opacity)"
+                                             From="1"
+                                             To="0"
+                                             Duration="0:0:.16"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.ExitActions>
             </Trigger>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="IconContentPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="IconContentPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="InfoBadge" Value="{x:Null}">
-                <Setter TargetName="PART_InfoBadge" Property="Margin" Value="0" />
-                <Setter TargetName="PART_InfoBadge" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="PART_InfoBadge" Property="Margin" Value="0"/>
+                <Setter TargetName="PART_InfoBadge" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelectedLeftFluent}" />
+                <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelectedLeftFluent}"/>
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsMouseOver" Value="True" />
-                    <Condition Property="IsActive" Value="False" />
+                    <Condition Property="IsMouseOver" Value="True"/>
+                    <Condition Property="IsActive" Value="False"/>
                 </MultiTrigger.Conditions>
                 <MultiTrigger.Setters>
-                    <Setter TargetName="IconContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewItemForegroundPointerOverLeftFluent}" />
-                    <Setter TargetName="ContentGrid" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewItemForegroundPointerOverLeftFluent}" />
+                    <Setter TargetName="IconContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewItemForegroundPointerOverLeftFluent}"/>
+                    <Setter TargetName="ContentGrid" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewItemForegroundPointerOverLeftFluent}"/>
                 </MultiTrigger.Setters>
             </MultiTrigger>
             <!--
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationView.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationView.xaml
index a5e08b7c2..a772970f3 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationView.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationView.xaml
@@ -5,59 +5,65 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewCompact.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewLeftMinimalCompact.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationLeftFluent.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewTop.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewBottom.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewCompact.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewLeftMinimalCompact.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationLeftFluent.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewTop.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewBottom.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="DefaultNavigationViewStyle" TargetType="{x:Type controls:NavigationView}">
-        <Setter Property="Foreground" Value="{DynamicResource NavigationViewItemForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="OpenPaneLength" Value="320" />
-        <Setter Property="CompactPaneLength" Value="40" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultNavigationViewStyle"
+           TargetType="{x:Type controls:NavigationView}"
+           >
+        <Setter Property="Foreground" Value="{DynamicResource NavigationViewItemForeground}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="OpenPaneLength" Value="320"/>
+        <Setter Property="CompactPaneLength" Value="40"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Style.Triggers>
             <Trigger Property="PaneDisplayMode" Value="Left">
-                <Setter Property="Template" Value="{StaticResource LeftNavigationViewTemplate}" />
-                <Setter Property="ItemTemplate" Value="{StaticResource LeftCompactNavigationViewItemTemplate}" />
+                <Setter Property="Template" Value="{StaticResource LeftNavigationViewTemplate}"/>
+                <Setter Property="ItemTemplate" Value="{StaticResource LeftCompactNavigationViewItemTemplate}"/>
             </Trigger>
             <Trigger Property="PaneDisplayMode" Value="LeftMinimal">
-                <Setter Property="Template" Value="{StaticResource LeftNavigationViewTemplate}" />
-                <Setter Property="ItemTemplate" Value="{StaticResource LeftMinimalCompactNavigationViewItemTemplate}" />
+                <Setter Property="Template" Value="{StaticResource LeftNavigationViewTemplate}"/>
+                <Setter Property="ItemTemplate" Value="{StaticResource LeftMinimalCompactNavigationViewItemTemplate}"/>
             </Trigger>
             <Trigger Property="PaneDisplayMode" Value="LeftFluent">
-                <Setter Property="Template" Value="{StaticResource LeftNavigationViewTemplate}" />
-                <Setter Property="ItemTemplate" Value="{StaticResource LeftFluentNavigationViewItemTemplate}" />
-                <Setter Property="OpenPaneLength" Value="NaN" />
+                <Setter Property="Template" Value="{StaticResource LeftNavigationViewTemplate}"/>
+                <Setter Property="ItemTemplate" Value="{StaticResource LeftFluentNavigationViewItemTemplate}"/>
+                <Setter Property="OpenPaneLength" Value="NaN"/>
             </Trigger>
             <Trigger Property="PaneDisplayMode" Value="Top">
-                <Setter Property="Template" Value="{StaticResource TopNavigationViewTemplate}" />
-                <Setter Property="ItemTemplate" Value="{StaticResource TopCompactNavigationViewItemTemplate}" />
+                <Setter Property="Template" Value="{StaticResource TopNavigationViewTemplate}"/>
+                <Setter Property="ItemTemplate" Value="{StaticResource TopCompactNavigationViewItemTemplate}"/>
             </Trigger>
             <Trigger Property="PaneDisplayMode" Value="Bottom">
-                <Setter Property="Template" Value="{StaticResource BottomNavigationViewTemplate}" />
-                <Setter Property="ItemTemplate" Value="{StaticResource BottomCompactNavigationViewItemTemplate}" />
+                <Setter Property="Template" Value="{StaticResource BottomNavigationViewTemplate}"/>
+                <Setter Property="ItemTemplate" Value="{StaticResource BottomCompactNavigationViewItemTemplate}"/>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource NavigationViewItemDefaultStyle}" TargetType="{x:Type controls:NavigationViewItem}" />
-    <Style BasedOn="{StaticResource DefaultNavigationViewStyle}" TargetType="{x:Type controls:NavigationView}" />
+    <Style BasedOn="{StaticResource NavigationViewItemDefaultStyle}"
+           TargetType="{x:Type controls:NavigationViewItem}"
+           />
+    <Style BasedOn="{StaticResource DefaultNavigationViewStyle}"
+           TargetType="{x:Type controls:NavigationView}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml
index 648d2b787..51529e02a 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml
@@ -1,97 +1,101 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewConstants.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewConstants.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="BasePaneButtonStyle" TargetType="{x:Type controls:Button}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="{StaticResource PaneToggleButtonThickness}" />
-        <Setter Property="FontSize" Value="16" />
-        <Setter Property="MinHeight" Value="{StaticResource PaneToggleButtonHeight}" />
-        <Setter Property="MinWidth" Value="{StaticResource PaneToggleButtonWidth}" />
-        <Setter Property="Padding" Value="10" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="BasePaneButtonStyle"
+           TargetType="{x:Type controls:Button}"
+           >
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="{StaticResource PaneToggleButtonThickness}"/>
+        <Setter Property="FontSize" Value="16"/>
+        <Setter Property="MinHeight" Value="{StaticResource PaneToggleButtonHeight}"/>
+        <Setter Property="MinWidth" Value="{StaticResource PaneToggleButtonWidth}"/>
+        <Setter Property="Padding" Value="10"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:Button}">
-                    <Border
-                        x:Name="LayoutRoot"
-                        MinWidth="{TemplateBinding MinWidth}"
-                        MinHeight="{TemplateBinding MinHeight}"
-                        Margin="0"
-                        Padding="{TemplateBinding Padding}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="Transparent"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}">
+                    <Border x:Name="LayoutRoot"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            Margin="0"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Background="Transparent"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                            >
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
 
-                            <ContentPresenter
-                                x:Name="Icon"
-                                Grid.Column="0"
-                                Margin="0,0,20,0"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding Icon}"
-                                Focusable="False"
-                                RenderTransformOrigin="0.5, 0.5"
-                                TextElement.Foreground="{TemplateBinding Foreground}">
+                            <ContentPresenter x:Name="Icon"
+                                              Grid.Column="0"
+                                              Margin="0,0,20,0"
+                                              VerticalAlignment="Center"
+                                              Content="{TemplateBinding Icon}"
+                                              Focusable="False"
+                                              RenderTransformOrigin="0.5, 0.5"
+                                              TextElement.Foreground="{TemplateBinding Foreground}"
+                                              >
                                 <ContentPresenter.RenderTransform>
-                                    <ScaleTransform x:Name="IconScaleTransform" ScaleX="1.0" ScaleY="1.0" />
+                                    <ScaleTransform x:Name="IconScaleTransform" ScaleX="1.0" ScaleY="1.0"/>
                                 </ContentPresenter.RenderTransform>
                             </ContentPresenter>
 
-                            <ContentPresenter Grid.Column="1" Content="{TemplateBinding Content}" />
+                            <ContentPresenter Grid.Column="1"
+                                              Content="{TemplateBinding Content}"
+                                              />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
+                            <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
-                            <Setter TargetName="Icon" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+                            <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}"/>
+                            <Setter TargetName="Icon" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}"/>
                         </Trigger>
                         <Trigger Property="Content" Value="{x:Null}">
-                            <Setter TargetName="Icon" Property="Margin" Value="0" />
+                            <Setter TargetName="Icon" Property="Margin" Value="0"/>
                         </Trigger>
                         <EventTrigger RoutedEvent="Button.PreviewMouseLeftButtonDown">
                             <BeginStoryboard>
                                 <Storyboard>
-                                    <DoubleAnimation
-                                        Storyboard.TargetName="IconScaleTransform"
-                                        Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
-                                        From="1.0"
-                                        To="0.85"
-                                        Duration="0:0:0.08" />
+                                    <DoubleAnimation Storyboard.TargetName="IconScaleTransform"
+                                                     Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
+                                                     From="1.0"
+                                                     To="0.85"
+                                                     Duration="0:0:0.08"
+                                                     />
                                 </Storyboard>
                             </BeginStoryboard>
                         </EventTrigger>
                         <EventTrigger RoutedEvent="Button.PreviewMouseLeftButtonUp">
                             <BeginStoryboard>
                                 <Storyboard>
-                                    <DoubleAnimation
-                                        Storyboard.TargetName="IconScaleTransform"
-                                        Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
-                                        From="0.85"
-                                        To="1.0"
-                                        Duration="0:0:0.08" />
+                                    <DoubleAnimation Storyboard.TargetName="IconScaleTransform"
+                                                     Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
+                                                     From="0.85"
+                                                     To="1.0"
+                                                     Duration="0:0:0.08"
+                                                     />
                                 </Storyboard>
                             </BeginStoryboard>
                         </EventTrigger>
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewBottom.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewBottom.xaml
index 77e1574ef..91bd22c6c 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewBottom.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewBottom.xaml
@@ -1,115 +1,121 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewItemDefaultStyle.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewConstants.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewItemDefaultStyle.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewConstants.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <ControlTemplate x:Key="BottomNavigationViewTemplate" TargetType="{x:Type controls:NavigationView}">
+    <ControlTemplate x:Key="BottomNavigationViewTemplate"
+                     TargetType="{x:Type controls:NavigationView}"
+                     >
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
 
                 <!--  Header  -->
-                <ContentPresenter
-                    Grid.Row="0"
-                    Margin="0"
-                    Content="{TemplateBinding Header}"
-                    Visibility="{TemplateBinding HeaderVisibility}" />
+                <ContentPresenter Grid.Row="0"
+                                  Margin="0"
+                                  Content="{TemplateBinding Header}"
+                                  Visibility="{TemplateBinding HeaderVisibility}"
+                                  />
 
                 <!--  Page content  -->
-                <controls:NavigationViewContentPresenter
-                    x:Name="PART_NavigationViewContentPresenter"
-                    Grid.Row="1"
-                    Margin="{TemplateBinding Padding}"
-                    Transition="{TemplateBinding Transition}"
-                    TransitionDuration="{TemplateBinding TransitionDuration}" />
+                <controls:NavigationViewContentPresenter x:Name="PART_NavigationViewContentPresenter"
+                                                         Grid.Row="1"
+                                                         Margin="{TemplateBinding Padding}"
+                                                         Transition="{TemplateBinding Transition}"
+                                                         TransitionDuration="{TemplateBinding TransitionDuration}"
+                                                         />
 
                 <!--  Overlay  -->
-                <ContentPresenter
-                    Grid.Row="0"
-                    Grid.RowSpan="2"
-                    Margin="0"
-                    Content="{TemplateBinding ContentOverlay}" />
+                <ContentPresenter Grid.Row="0"
+                                  Grid.RowSpan="2"
+                                  Margin="0"
+                                  Content="{TemplateBinding ContentOverlay}"
+                                  />
             </Grid>
-            <Grid x:Name="PaneGrid" Grid.Row="1">
+            <Grid x:Name="PaneGrid"
+                  Grid.Row="1"
+                  >
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
 
-                <controls:Button
-                    x:Name="PART_BackButton"
-                    Grid.Column="0"
-                    IsEnabled="{TemplateBinding IsBackEnabled}"
-                    Style="{StaticResource BasePaneButtonStyle}"
-                    Visibility="{TemplateBinding IsBackButtonVisible,
-                                                 Converter={StaticResource BackButtonVisibilityToVisibilityConverter}}">
+                <controls:Button x:Name="PART_BackButton"
+                                 Grid.Column="0"
+                                 IsEnabled="{TemplateBinding IsBackEnabled}"
+                                 Style="{StaticResource BasePaneButtonStyle}"
+                                 Visibility="{TemplateBinding IsBackButtonVisible,
+                                                              Converter={StaticResource BackButtonVisibilityToVisibilityConverter}}"
+                                 >
                     <controls:Button.Icon>
-                        <controls:SymbolIcon Symbol="ArrowLeft48" />
+                        <controls:SymbolIcon Symbol="ArrowLeft48"/>
                     </controls:Button.Icon>
                 </controls:Button>
 
                 <!--  Pane header  -->
-                <ContentPresenter
-                    Grid.Column="1"
-                    Margin="0"
-                    Content="{TemplateBinding PaneHeader}" />
+                <ContentPresenter Grid.Column="1"
+                                  Margin="0"
+                                  Content="{TemplateBinding PaneHeader}"
+                                  />
 
-                <ItemsControl
-                    x:Name="PART_MenuItemsItemsControl"
-                    Grid.Column="2"
-                    Focusable="False"
-                    KeyboardNavigation.DirectionalNavigation="Contained"
-                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                    ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                <ItemsControl x:Name="PART_MenuItemsItemsControl"
+                              Grid.Column="2"
+                              Focusable="False"
+                              KeyboardNavigation.DirectionalNavigation="Contained"
+                              ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                              ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                              >
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                            <StackPanel
-                                Margin="0"
-                                IsItemsHost="True"
-                                Orientation="Horizontal" />
+                            <StackPanel Margin="0"
+                                        IsItemsHost="True"
+                                        Orientation="Horizontal"
+                                        />
                         </ItemsPanelTemplate>
                     </ItemsControl.ItemsPanel>
                 </ItemsControl>
 
                 <!--  Auto Suggest Box  -->
-                <ContentPresenter Grid.Column="3" Content="{TemplateBinding AutoSuggestBox}" />
+                <ContentPresenter Grid.Column="3"
+                                  Content="{TemplateBinding AutoSuggestBox}"
+                                  />
 
                 <!--  Pane footer  -->
-                <ContentPresenter
-                    Grid.Column="4"
-                    Margin="0"
-                    Content="{TemplateBinding PaneFooter}" />
+                <ContentPresenter Grid.Column="4"
+                                  Margin="0"
+                                  Content="{TemplateBinding PaneFooter}"
+                                  />
 
-                <ItemsControl
-                    x:Name="PART_FooterMenuItemsItemsControl"
-                    Grid.Column="5"
-                    Focusable="False"
-                    KeyboardNavigation.DirectionalNavigation="Contained"
-                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                    ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                <ItemsControl x:Name="PART_FooterMenuItemsItemsControl"
+                              Grid.Column="5"
+                              Focusable="False"
+                              KeyboardNavigation.DirectionalNavigation="Contained"
+                              ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                              ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                              >
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                            <StackPanel
-                                Margin="0"
-                                IsItemsHost="True"
-                                Orientation="Horizontal" />
+                            <StackPanel Margin="0"
+                                        IsItemsHost="True"
+                                        Orientation="Horizontal"
+                                        />
                         </ItemsPanelTemplate>
                     </ItemsControl.ItemsPanel>
                 </ItemsControl>
@@ -117,73 +123,75 @@
         </Grid>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="BottomCompactNavigationViewItemTemplate" TargetType="{x:Type controls:NavigationViewItem}">
+    <ControlTemplate x:Key="BottomCompactNavigationViewItemTemplate"
+                     TargetType="{x:Type controls:NavigationViewItem}"
+                     >
         <Border x:Name="MainBorder">
             <Grid>
-                <Grid
-                    Margin="12,8,12,8"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch">
+                <Grid Margin="12,8,12,8"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      >
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <ContentPresenter
-                        x:Name="IconContentPresenter"
-                        Grid.Column="0"
-                        Margin="0,0,6,0"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Content="{TemplateBinding Icon}"
-                        TextElement.FontSize="16"
-                        TextElement.Foreground="{DynamicResource NavigationViewItemForeground}" />
+                    <ContentPresenter x:Name="IconContentPresenter"
+                                      Grid.Column="0"
+                                      Margin="0,0,6,0"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      Content="{TemplateBinding Icon}"
+                                      TextElement.FontSize="16"
+                                      TextElement.Foreground="{DynamicResource NavigationViewItemForeground}"
+                                      />
 
-                    <ContentPresenter
-                        x:Name="ElementContentPresenter"
-                        Grid.Column="1"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Content="{TemplateBinding Content}"
-                        TextElement.FontSize="14"
-                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                    <ContentPresenter x:Name="ElementContentPresenter"
+                                      Grid.Column="1"
+                                      HorizontalAlignment="Left"
+                                      VerticalAlignment="Center"
+                                      Content="{TemplateBinding Content}"
+                                      TextElement.FontSize="14"
+                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                      />
 
-                    <ContentPresenter
-                        x:Name="PART_InfoBadge"
-                        Grid.Column="2"
-                        Margin="2"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        Content="{TemplateBinding InfoBadge}" />
+                    <ContentPresenter x:Name="PART_InfoBadge"
+                                      Grid.Column="2"
+                                      Margin="2"
+                                      HorizontalAlignment="Right"
+                                      VerticalAlignment="Center"
+                                      Content="{TemplateBinding InfoBadge}"
+                                      />
                 </Grid>
-                <Rectangle
-                    x:Name="ActiveRectangle"
-                    Grid.Column="0"
-                    Width="16"
-                    Height="3"
-                    Margin="0,0,0,-4"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Bottom"
-                    Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
-                    Opacity="0.0"
-                    RadiusX="2"
-                    RadiusY="2" />
+                <Rectangle x:Name="ActiveRectangle"
+                           Grid.Column="0"
+                           Width="16"
+                           Height="3"
+                           Margin="0,0,0,-4"
+                           HorizontalAlignment="Center"
+                           VerticalAlignment="Bottom"
+                           Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
+                           Opacity="0.0"
+                           RadiusX="2"
+                           RadiusY="2"
+                           />
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="IsActive" Value="True">
-                <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
+                <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0"/>
             </Trigger>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="IconContentPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="IconContentPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="Content" Value="{x:Null}">
-                <Setter TargetName="IconContentPresenter" Property="Margin" Value="0" />
-                <Setter TargetName="ElementContentPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="IconContentPresenter" Property="Margin" Value="0"/>
+                <Setter TargetName="ElementContentPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="Content" Value="">
-                <Setter TargetName="IconContentPresenter" Property="Margin" Value="0" />
-                <Setter TargetName="ElementContentPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="IconContentPresenter" Property="Margin" Value="0"/>
+                <Setter TargetName="ElementContentPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewBreadcrumbItem.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewBreadcrumbItem.xaml
index b59a84291..9bb96f10e 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewBreadcrumbItem.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewBreadcrumbItem.xaml
@@ -5,13 +5,17 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <DataTemplate x:Key="NavigationViewItemDataTemplate" DataType="{x:Type controls:NavigationViewBreadcrumbItem}">
-        <controls:TextBlock FontTypography="Title" Text="{Binding Content}" />
+    <DataTemplate x:Key="NavigationViewItemDataTemplate"
+                  DataType="{x:Type controls:NavigationViewBreadcrumbItem}"
+                  >
+        <controls:TextBlock FontTypography="Title"
+                            Text="{Binding Content}"
+                            />
     </DataTemplate>
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml
index 29b31e856..774766c40 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml
@@ -1,190 +1,202 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewItemDefaultStyle.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewConstants.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewItemDefaultStyle.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewConstants.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <ControlTemplate x:Key="LeftCompactNavigationViewItemTemplate" TargetType="{x:Type controls:NavigationViewItem}">
+    <ControlTemplate x:Key="LeftCompactNavigationViewItemTemplate"
+                     TargetType="{x:Type controls:NavigationViewItem}"
+                     >
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <Border
-                x:Name="MainBorder"
-                Grid.Row="0"
-                MinWidth="40"
-                MinHeight="40"
-                Margin="0"
-                Padding="0"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="1"
-                CornerRadius="{TemplateBinding Border.CornerRadius}">
+            <Border x:Name="MainBorder"
+                    Grid.Row="0"
+                    MinWidth="40"
+                    MinHeight="40"
+                    Margin="0"
+                    Padding="0"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="1"
+                    CornerRadius="{TemplateBinding Border.CornerRadius}"
+                    >
                 <Border.Style>
                     <Style TargetType="{x:Type Border}">
-                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Background" Value="Transparent"/>
                         <Style.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPointerOver}" />
+                                <Setter Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPointerOver}"/>
                             </Trigger>
                         </Style.Triggers>
                     </Style>
                 </Border.Style>
                 <Grid Background="Transparent">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="40" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="40"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
                     <Grid Grid.Column="0">
-                        <ContentPresenter
-                            x:Name="IconContentPresenter"
-                            Margin="-1,0,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding Icon}"
-                            Focusable="False"
-                            TextElement.FontSize="16"
-                            TextElement.Foreground="{DynamicResource NavigationViewItemForeground}" />
+                        <ContentPresenter x:Name="IconContentPresenter"
+                                          Margin="-1,0,0,0"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          Content="{TemplateBinding Icon}"
+                                          Focusable="False"
+                                          TextElement.FontSize="16"
+                                          TextElement.Foreground="{DynamicResource NavigationViewItemForeground}"
+                                          />
                     </Grid>
 
-                    <Rectangle
-                        x:Name="ActiveRectangle"
-                        Grid.Column="0"
-                        Width="3"
-                        Height="16"
-                        Margin="0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
-                        Opacity="0.0"
-                        RadiusX="2"
-                        RadiusY="2" />
+                    <Rectangle x:Name="ActiveRectangle"
+                               Grid.Column="0"
+                               Width="3"
+                               Height="16"
+                               Margin="0"
+                               HorizontalAlignment="Left"
+                               VerticalAlignment="Center"
+                               Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
+                               Opacity="0.0"
+                               RadiusX="2"
+                               RadiusY="2"
+                               />
 
-                    <ContentPresenter
-                        x:Name="ElementContentPresenter"
-                        Grid.Column="1"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Content="{TemplateBinding Content}"
-                        TextElement.FontSize="14"
-                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                    <ContentPresenter x:Name="ElementContentPresenter"
+                                      Grid.Column="1"
+                                      HorizontalAlignment="Left"
+                                      VerticalAlignment="Center"
+                                      Content="{TemplateBinding Content}"
+                                      TextElement.FontSize="14"
+                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                      />
 
-                    <ContentPresenter
-                        x:Name="PART_InfoBadge"
-                        Grid.Column="2"
-                        Margin="0"
-                        Content="{TemplateBinding InfoBadge}" />
+                    <ContentPresenter x:Name="PART_InfoBadge"
+                                      Grid.Column="2"
+                                      Margin="0"
+                                      Content="{TemplateBinding InfoBadge}"
+                                      />
 
-                    <Grid
-                        x:Name="PART_ChevronGrid"
-                        Grid.Column="3"
-                        Width="0"
-                        Visibility="Collapsed">
-                        <controls:SymbolIcon
-                            x:Name="ChevronIcon"
-                            Margin="0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="{StaticResource NavigationViewItemChevronSize}"
-                            Foreground="{DynamicResource NavigationViewItemForeground}"
-                            RenderTransformOrigin="0.5, 0.5"
-                            Symbol="ChevronDown24">
+                    <Grid x:Name="PART_ChevronGrid"
+                          Grid.Column="3"
+                          Width="0"
+                          Visibility="Collapsed"
+                          >
+                        <controls:SymbolIcon x:Name="ChevronIcon"
+                                             Margin="0"
+                                             HorizontalAlignment="Center"
+                                             VerticalAlignment="Center"
+                                             FontSize="{StaticResource NavigationViewItemChevronSize}"
+                                             Foreground="{DynamicResource NavigationViewItemForeground}"
+                                             RenderTransformOrigin="0.5, 0.5"
+                                             Symbol="ChevronDown24"
+                                             >
                             <controls:SymbolIcon.RenderTransform>
-                                <RotateTransform Angle="0" />
+                                <RotateTransform Angle="0"/>
                             </controls:SymbolIcon.RenderTransform>
                         </controls:SymbolIcon>
                     </Grid>
                 </Grid>
             </Border>
-            <ItemsControl
-                x:Name="MenuItemsPresenter"
-                Grid.Row="1"
-                Focusable="False"
-                ItemsSource="{TemplateBinding MenuItems}"
-                KeyboardNavigation.DirectionalNavigation="Contained"
-                Opacity="0.0"
-                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                Visibility="Collapsed">
+            <ItemsControl x:Name="MenuItemsPresenter"
+                          Grid.Row="1"
+                          Focusable="False"
+                          ItemsSource="{TemplateBinding MenuItems}"
+                          KeyboardNavigation.DirectionalNavigation="Contained"
+                          Opacity="0.0"
+                          ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                          ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                          Visibility="Collapsed"
+                          >
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <StackPanel Margin="0" IsItemsHost="True" />
+                        <StackPanel Margin="0"
+                                    IsItemsHost="True"
+                                    />
                     </ItemsPanelTemplate>
                 </ItemsControl.ItemsPanel>
                 <ItemsControl.Resources>
-                    <Style BasedOn="{StaticResource NavigationViewItemDefaultStyle}" TargetType="{x:Type controls:NavigationViewItem}">
+                    <Style BasedOn="{StaticResource NavigationViewItemDefaultStyle}"
+                           TargetType="{x:Type controls:NavigationViewItem}"
+                           >
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="{x:Type controls:NavigationViewItem}">
-                                    <Border
-                                        x:Name="MainBorder"
-                                        Height="40"
-                                        HorizontalAlignment="Stretch"
-                                        BorderThickness="1"
-                                        CornerRadius="4">
-                                        <Grid Margin="30,0,0,0" HorizontalAlignment="Stretch">
+                                    <Border x:Name="MainBorder"
+                                            Height="40"
+                                            HorizontalAlignment="Stretch"
+                                            BorderThickness="1"
+                                            CornerRadius="4"
+                                            >
+                                        <Grid Margin="30,0,0,0"
+                                              HorizontalAlignment="Stretch"
+                                              >
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto" />
-                                                <ColumnDefinition Width="Auto" />
-                                                <ColumnDefinition Width="*" MinWidth="180" />
-                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="Auto"/>
+                                                <ColumnDefinition Width="Auto"/>
+                                                <ColumnDefinition Width="*"
+                                                                  MinWidth="180"
+                                                                  />
+                                                <ColumnDefinition Width="Auto"/>
                                             </Grid.ColumnDefinitions>
 
-                                            <Rectangle
-                                                x:Name="ActiveRectangle"
-                                                Grid.Column="0"
-                                                Width="3"
-                                                Height="16"
-                                                Margin="0"
-                                                HorizontalAlignment="Left"
-                                                VerticalAlignment="Center"
-                                                Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
-                                                Opacity="0.0"
-                                                RadiusX="2"
-                                                RadiusY="2" />
+                                            <Rectangle x:Name="ActiveRectangle"
+                                                       Grid.Column="0"
+                                                       Width="3"
+                                                       Height="16"
+                                                       Margin="0"
+                                                       HorizontalAlignment="Left"
+                                                       VerticalAlignment="Center"
+                                                       Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
+                                                       Opacity="0.0"
+                                                       RadiusX="2"
+                                                       RadiusY="2"
+                                                       />
 
-                                            <ContentPresenter
-                                                x:Name="IconContentPresenter"
-                                                Grid.Column="1"
-                                                Margin="6,0,3,0"
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                Content="{TemplateBinding Icon}"
-                                                Focusable="False"
-                                                TextElement.FontSize="18"
-                                                TextElement.Foreground="{DynamicResource NavigationViewItemForeground}"
-                                                Visibility="{TemplateBinding Icon,
-                                                                             Converter={StaticResource NullToVisibilityConverter}}" />
-                                            <ContentPresenter
-                                                x:Name="ElementContentPresenter"
-                                                Grid.Column="2"
-                                                Margin="10,0,0,0"
-                                                HorizontalAlignment="Stretch"
-                                                VerticalAlignment="Center"
-                                                Content="{TemplateBinding Content}"
-                                                TextElement.FontSize="14"
-                                                TextElement.Foreground="{TemplateBinding Foreground}" />
+                                            <ContentPresenter x:Name="IconContentPresenter"
+                                                              Grid.Column="1"
+                                                              Margin="6,0,3,0"
+                                                              HorizontalAlignment="Center"
+                                                              VerticalAlignment="Center"
+                                                              Content="{TemplateBinding Icon}"
+                                                              Focusable="False"
+                                                              TextElement.FontSize="18"
+                                                              TextElement.Foreground="{DynamicResource NavigationViewItemForeground}"
+                                                              Visibility="{TemplateBinding Icon,
+                                                                                           Converter={StaticResource NullToVisibilityConverter}}"
+                                                              />
+                                            <ContentPresenter x:Name="ElementContentPresenter"
+                                                              Grid.Column="2"
+                                                              Margin="10,0,0,0"
+                                                              HorizontalAlignment="Stretch"
+                                                              VerticalAlignment="Center"
+                                                              Content="{TemplateBinding Content}"
+                                                              TextElement.FontSize="14"
+                                                              TextElement.Foreground="{TemplateBinding Foreground}"
+                                                              />
 
-                                            <ContentPresenter Grid.Column="3" Content="{TemplateBinding InfoBadge}" />
+                                            <ContentPresenter Grid.Column="3"
+                                                              Content="{TemplateBinding InfoBadge}"
+                                                              />
                                         </Grid>
                                     </Border>
                                     <ControlTemplate.Triggers>
                                         <Trigger Property="IsActive" Value="True">
-                                            <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
-                                            <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelected}" />
+                                            <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0"/>
+                                            <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelected}"/>
                                         </Trigger>
                                         <Trigger Property="IsMouseOver" Value="True">
-                                            <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPointerOver}" />
+                                            <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPointerOver}"/>
                                         </Trigger>
                                         <Trigger Property="IsPressed" Value="True">
-                                            <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPressed}" />
+                                            <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPressed}"/>
                                         </Trigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
@@ -197,199 +209,207 @@
         <ControlTemplate.Triggers>
 
             <Trigger Property="IsPaneOpen" Value="True">
-                <Setter TargetName="PART_InfoBadge" Property="Grid.Column" Value="2" />
+                <Setter TargetName="PART_InfoBadge" Property="Grid.Column" Value="2"/>
             </Trigger>
             <Trigger Property="IsPaneOpen" Value="False">
-                <Setter TargetName="PART_InfoBadge" Property="Grid.Column" Value="0" />
-                <Setter TargetName="PART_InfoBadge" Property="VerticalAlignment" Value="Top" />
-                <Setter TargetName="PART_InfoBadge" Property="HorizontalAlignment" Value="Right" />
+                <Setter TargetName="PART_InfoBadge" Property="Grid.Column" Value="0"/>
+                <Setter TargetName="PART_InfoBadge" Property="VerticalAlignment" Value="Top"/>
+                <Setter TargetName="PART_InfoBadge" Property="HorizontalAlignment" Value="Right"/>
             </Trigger>
 
             <Trigger Property="InfoBadge" Value="{x:Null}">
-                <Setter TargetName="PART_InfoBadge" Property="Margin" Value="0" />
-                <Setter TargetName="PART_InfoBadge" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="PART_InfoBadge" Property="Margin" Value="0"/>
+                <Setter TargetName="PART_InfoBadge" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="HasMenuItems" Value="True">
-                <Setter TargetName="PART_ChevronGrid" Property="Visibility" Value="Visible" />
-                <Setter TargetName="PART_ChevronGrid" Property="Width" Value="40" />
+                <Setter TargetName="PART_ChevronGrid" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="PART_ChevronGrid" Property="Width" Value="40"/>
             </Trigger>
             <Trigger Property="IsExpanded" Value="True">
-                <Setter TargetName="MenuItemsPresenter" Property="Visibility" Value="Visible" />
+                <Setter TargetName="MenuItemsPresenter" Property="Visibility" Value="Visible"/>
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="MenuItemsPresenter"
-                                Storyboard.TargetProperty="(ItemsControl.Opacity)"
-                                From="0.0"
-                                To="1.0"
-                                Duration="00:00:00.167" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="ChevronIcon"
-                                Storyboard.TargetProperty="(Control.RenderTransform).(RotateTransform.Angle)"
-                                To="-180"
-                                Duration="00:00:00.167" />
+                            <DoubleAnimation Storyboard.TargetName="MenuItemsPresenter"
+                                             Storyboard.TargetProperty="(ItemsControl.Opacity)"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="00:00:00.167"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="ChevronIcon"
+                                             Storyboard.TargetProperty="(Control.RenderTransform).(RotateTransform.Angle)"
+                                             To="-180"
+                                             Duration="00:00:00.167"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="MenuItemsPresenter"
-                                Storyboard.TargetProperty="(ItemsControl.Opacity)"
-                                From="1.0"
-                                To="0.0"
-                                Duration="00:00:00.167" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="ChevronIcon"
-                                Storyboard.TargetProperty="(Control.RenderTransform).(RotateTransform.Angle)"
-                                To="0"
-                                Duration="00:00:00.167" />
+                            <DoubleAnimation Storyboard.TargetName="MenuItemsPresenter"
+                                             Storyboard.TargetProperty="(ItemsControl.Opacity)"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="00:00:00.167"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="ChevronIcon"
+                                             Storyboard.TargetProperty="(Control.RenderTransform).(RotateTransform.Angle)"
+                                             To="0"
+                                             Duration="00:00:00.167"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.ExitActions>
             </Trigger>
 
             <Trigger Property="IsActive" Value="True">
-                <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
-                <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelected}" />
+                <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0"/>
+                <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelected}"/>
                 <!--<Setter TargetName="IconContentPresenter" Property="Filled" Value="True" /> -->
                 <!--<Setter TargetName="IconContentPresenter" Property="Foreground" Value="{DynamicResource SystemAccentBrush}" />-->
             </Trigger>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="IconContentPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="IconContentPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsMouseOver" Value="True" />
-                    <Condition Property="IsActive" Value="False" />
+                    <Condition Property="IsMouseOver" Value="True"/>
+                    <Condition Property="IsActive" Value="False"/>
                 </MultiTrigger.Conditions>
                 <MultiTrigger.Setters>
-                    <Setter TargetName="IconContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewItemForegroundPointerOver}" />
-                    <Setter TargetName="ElementContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewItemForegroundPointerOver}" />
+                    <Setter TargetName="IconContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewItemForegroundPointerOver}"/>
+                    <Setter TargetName="ElementContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewItemForegroundPointerOver}"/>
                 </MultiTrigger.Setters>
             </MultiTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="LeftNavigationViewTemplate" TargetType="{x:Type controls:NavigationView}">
+    <ControlTemplate x:Key="LeftNavigationViewTemplate"
+                     TargetType="{x:Type controls:NavigationView}"
+                     >
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
-            <Grid
-                x:Name="PaneGrid"
-                Grid.Column="0"
-                Width="{TemplateBinding OpenPaneLength}"
-                Margin="4,0">
+            <Grid x:Name="PaneGrid"
+                  Grid.Column="0"
+                  Width="{TemplateBinding OpenPaneLength}"
+                  Margin="4,0"
+                  >
                 <Border x:Name="PaneBorder">
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
 
                         <!--  Back and Toggle buttons  -->
                         <Grid Grid.Row="0">
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
                             </Grid.RowDefinitions>
 
-                            <controls:Button
-                                x:Name="PART_BackButton"
-                                Grid.Row="0"
-                                Margin="0,5,0,5"
-                                HorizontalAlignment="Left"
-                                IsEnabled="{TemplateBinding IsBackEnabled}"
-                                Style="{StaticResource BasePaneButtonStyle}"
-                                Visibility="{TemplateBinding IsBackButtonVisible,
-                                                             Converter={StaticResource BackButtonVisibilityToVisibilityConverter}}">
+                            <controls:Button x:Name="PART_BackButton"
+                                             Grid.Row="0"
+                                             Margin="0,5,0,5"
+                                             HorizontalAlignment="Left"
+                                             IsEnabled="{TemplateBinding IsBackEnabled}"
+                                             Style="{StaticResource BasePaneButtonStyle}"
+                                             Visibility="{TemplateBinding IsBackButtonVisible,
+                                                                          Converter={StaticResource BackButtonVisibilityToVisibilityConverter}}"
+                                             >
                                 <controls:Button.Icon>
-                                    <controls:SymbolIcon Symbol="ArrowLeft48" />
+                                    <controls:SymbolIcon Symbol="ArrowLeft48"/>
                                 </controls:Button.Icon>
                             </controls:Button>
 
-                            <controls:Button
-                                x:Name="PART_ToggleButton"
-                                Grid.Row="1"
-                                Margin="0,0,0,5"
-                                Style="{StaticResource BasePaneButtonStyle}"
-                                Visibility="{TemplateBinding IsPaneToggleVisible,
-                                                             Converter={StaticResource BoolToVisibilityConverter}}">
+                            <controls:Button x:Name="PART_ToggleButton"
+                                             Grid.Row="1"
+                                             Margin="0,0,0,5"
+                                             Style="{StaticResource BasePaneButtonStyle}"
+                                             Visibility="{TemplateBinding IsPaneToggleVisible,
+                                                                          Converter={StaticResource BoolToVisibilityConverter}}"
+                                             >
                                 <controls:Button.Icon>
-                                    <controls:SymbolIcon Symbol="LineHorizontal320" />
+                                    <controls:SymbolIcon Symbol="LineHorizontal320"/>
                                 </controls:Button.Icon>
                                 <controls:Button.Content>
-                                    <TextBlock FontWeight="Medium" Text="{TemplateBinding PaneTitle}" />
+                                    <TextBlock FontWeight="Medium"
+                                               Text="{TemplateBinding PaneTitle}"
+                                               />
                                 </controls:Button.Content>
                             </controls:Button>
 
                             <!--  Pane header  -->
-                            <ContentPresenter
-                                Grid.Row="2"
-                                Margin="0"
-                                Content="{TemplateBinding PaneHeader}" />
+                            <ContentPresenter Grid.Row="2"
+                                              Margin="0"
+                                              Content="{TemplateBinding PaneHeader}"
+                                              />
 
                             <!--  Auto Suggest Box  -->
-                            <ContentPresenter
-                                x:Name="AutoSuggestBoxContentPresenter"
-                                Grid.Row="3"
-                                Margin="0"
-                                Content="{TemplateBinding AutoSuggestBox}" />
+                            <ContentPresenter x:Name="AutoSuggestBoxContentPresenter"
+                                              Grid.Row="3"
+                                              Margin="0"
+                                              Content="{TemplateBinding AutoSuggestBox}"
+                                              />
 
-                            <controls:Button
-                                x:Name="PART_AutoSuggestBoxSymbolButton"
-                                Grid.Row="3"
-                                Margin="0,0,0,6"
-                                Icon="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=AutoSuggestBox.Icon}"
-                                Style="{StaticResource BasePaneButtonStyle}"
-                                Visibility="Collapsed" />
+                            <controls:Button x:Name="PART_AutoSuggestBoxSymbolButton"
+                                             Grid.Row="3"
+                                             Margin="0,0,0,6"
+                                             Icon="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=AutoSuggestBox.Icon}"
+                                             Style="{StaticResource BasePaneButtonStyle}"
+                                             Visibility="Collapsed"
+                                             />
                         </Grid>
 
                         <!--  Menu items  -->
-                        <controls:DynamicScrollViewer
-                            Grid.Row="1"
-                            Margin="0,0,-4,0"
-                            Padding="0,0,4,0"
-                            CanContentScroll="True"
-                            HorizontalScrollBarVisibility="Disabled"
-                            VerticalScrollBarVisibility="Auto">
+                        <controls:DynamicScrollViewer Grid.Row="1"
+                                                      Margin="0,0,-4,0"
+                                                      Padding="0,0,4,0"
+                                                      CanContentScroll="True"
+                                                      HorizontalScrollBarVisibility="Disabled"
+                                                      VerticalScrollBarVisibility="Auto"
+                                                      >
                             <Grid>
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
-                                <ItemsControl
-                                    x:Name="PART_MenuItemsItemsControl"
-                                    Grid.Row="0"
-                                    Focusable="False"
-                                    KeyboardNavigation.DirectionalNavigation="Contained"
-                                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                    ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                                <ItemsControl x:Name="PART_MenuItemsItemsControl"
+                                              Grid.Row="0"
+                                              Focusable="False"
+                                              KeyboardNavigation.DirectionalNavigation="Contained"
+                                              ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                              ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                                              >
                                     <ItemsControl.ItemsPanel>
                                         <ItemsPanelTemplate>
-                                            <StackPanel Margin="0" IsItemsHost="True" />
+                                            <StackPanel Margin="0"
+                                                        IsItemsHost="True"
+                                                        />
                                         </ItemsPanelTemplate>
                                     </ItemsControl.ItemsPanel>
                                 </ItemsControl>
-                                <ItemsControl
-                                    x:Name="PART_FooterMenuItemsItemsControl"
-                                    Grid.Row="1"
-                                    Margin="0,0,0,4"
-                                    Focusable="False"
-                                    KeyboardNavigation.DirectionalNavigation="Contained"
-                                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                    ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                                <ItemsControl x:Name="PART_FooterMenuItemsItemsControl"
+                                              Grid.Row="1"
+                                              Margin="0,0,0,4"
+                                              Focusable="False"
+                                              KeyboardNavigation.DirectionalNavigation="Contained"
+                                              ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                              ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                                              >
                                     <ItemsControl.ItemsPanel>
                                         <ItemsPanelTemplate>
-                                            <StackPanel Margin="0" IsItemsHost="True" />
+                                            <StackPanel Margin="0"
+                                                        IsItemsHost="True"
+                                                        />
                                         </ItemsPanelTemplate>
                                     </ItemsControl.ItemsPanel>
                                 </ItemsControl>
@@ -397,47 +417,47 @@
                         </controls:DynamicScrollViewer>
 
                         <!--  Pane footer  -->
-                        <ContentPresenter
-                            Grid.Row="2"
-                            Margin="0"
-                            Content="{TemplateBinding PaneFooter}" />
+                        <ContentPresenter Grid.Row="2"
+                                          Margin="0"
+                                          Content="{TemplateBinding PaneFooter}"
+                                          />
                     </Grid>
                 </Border>
             </Grid>
-            <Border
-                Grid.Column="1"
-                Margin="{TemplateBinding FrameMargin}"
-                Background="{DynamicResource NavigationViewContentBackground}"
-                BorderBrush="{DynamicResource NavigationViewContentGridBorderBrush}"
-                BorderThickness="1,1,0,0"
-                CornerRadius="8,0,0,0">
+            <Border Grid.Column="1"
+                    Margin="{TemplateBinding FrameMargin}"
+                    Background="{DynamicResource NavigationViewContentBackground}"
+                    BorderBrush="{DynamicResource NavigationViewContentGridBorderBrush}"
+                    BorderThickness="1,1,0,0"
+                    CornerRadius="8,0,0,0"
+                    >
                 <Grid>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
 
                     <!--  Header  -->
-                    <ContentPresenter
-                        Grid.Row="0"
-                        Margin="0"
-                        Content="{TemplateBinding Header}"
-                        Visibility="{TemplateBinding HeaderVisibility}" />
+                    <ContentPresenter Grid.Row="0"
+                                      Margin="0"
+                                      Content="{TemplateBinding Header}"
+                                      Visibility="{TemplateBinding HeaderVisibility}"
+                                      />
 
                     <!--  Page content  -->
-                    <controls:NavigationViewContentPresenter
-                        x:Name="PART_NavigationViewContentPresenter"
-                        Grid.Row="1"
-                        Padding="{TemplateBinding Padding}"
-                        Transition="{TemplateBinding Transition}"
-                        TransitionDuration="{TemplateBinding TransitionDuration}" />
+                    <controls:NavigationViewContentPresenter x:Name="PART_NavigationViewContentPresenter"
+                                                             Grid.Row="1"
+                                                             Padding="{TemplateBinding Padding}"
+                                                             Transition="{TemplateBinding Transition}"
+                                                             TransitionDuration="{TemplateBinding TransitionDuration}"
+                                                             />
 
                     <!--  Overlay  -->
-                    <ContentPresenter
-                        Grid.Row="0"
-                        Grid.RowSpan="2"
-                        Margin="0"
-                        Content="{TemplateBinding ContentOverlay}" />
+                    <ContentPresenter Grid.Row="0"
+                                      Grid.RowSpan="2"
+                                      Margin="0"
+                                      Content="{TemplateBinding ContentOverlay}"
+                                      />
                 </Grid>
             </Border>
 
@@ -445,24 +465,24 @@
                 <VisualStateGroup Name="PaneStates">
                     <VisualState Name="PaneOpen">
                         <Storyboard>
-                            <DoubleAnimation
-                                AccelerationRatio="0.4"
-                                Storyboard.TargetName="PaneGrid"
-                                Storyboard.TargetProperty="Width"
-                                From="40"
-                                To="{TemplateBinding OpenPaneLength}"
-                                Duration="0:0:.16" />
+                            <DoubleAnimation AccelerationRatio="0.4"
+                                             Storyboard.TargetName="PaneGrid"
+                                             Storyboard.TargetProperty="Width"
+                                             From="40"
+                                             To="{TemplateBinding OpenPaneLength}"
+                                             Duration="0:0:.16"
+                                             />
                         </Storyboard>
                     </VisualState>
                     <VisualState Name="PaneCompact">
                         <Storyboard>
-                            <DoubleAnimation
-                                AccelerationRatio="0.4"
-                                Storyboard.TargetName="PaneGrid"
-                                Storyboard.TargetProperty="Width"
-                                From="{TemplateBinding OpenPaneLength}"
-                                To="40"
-                                Duration="0:0:.16" />
+                            <DoubleAnimation AccelerationRatio="0.4"
+                                             Storyboard.TargetName="PaneGrid"
+                                             Storyboard.TargetProperty="Width"
+                                             From="{TemplateBinding OpenPaneLength}"
+                                             To="40"
+                                             Duration="0:0:.16"
+                                             />
                         </Storyboard>
                     </VisualState>
                 </VisualStateGroup>
@@ -471,16 +491,16 @@
 
         <ControlTemplate.Triggers>
             <Trigger Property="IsPaneOpen" Value="False">
-                <Setter TargetName="PART_AutoSuggestBoxSymbolButton" Property="Visibility" Value="Visible" />
-                <Setter TargetName="AutoSuggestBoxContentPresenter" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="PART_ToggleButton" Property="Content" Value="{x:Null}" />
+                <Setter TargetName="PART_AutoSuggestBoxSymbolButton" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="AutoSuggestBoxContentPresenter" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="PART_ToggleButton" Property="Content" Value="{x:Null}"/>
             </Trigger>
             <Trigger Property="AutoSuggestBox" Value="{x:Null}">
-                <Setter TargetName="PART_AutoSuggestBoxSymbolButton" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="PART_AutoSuggestBoxSymbolButton" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="PaneTitle" Value="{x:Null}">
-                <Setter TargetName="PART_ToggleButton" Property="Content" Value="{x:Null}" />
-                <Setter TargetName="PART_ToggleButton" Property="HorizontalAlignment" Value="Left" />
+                <Setter TargetName="PART_ToggleButton" Property="Content" Value="{x:Null}"/>
+                <Setter TargetName="PART_ToggleButton" Property="HorizontalAlignment" Value="Left"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewConstants.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewConstants.xaml
index 5c396e733..62c255ed0 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewConstants.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewConstants.xaml
@@ -1,8 +1,8 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
-    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"
+                    >
 
     <system:Double x:Key="NavigationViewFluentIconSize">24</system:Double>
     <system:Double x:Key="PaneToggleButtonHeight">40</system:Double>
@@ -12,8 +12,8 @@
     <system:Double x:Key="NavigationViewItemChevronSize">12</system:Double>
     <Thickness x:Key="PaneToggleButtonThickness">1,1,1,1</Thickness>
 
-    <converters:BackButtonVisibilityToVisibilityConverter x:Key="BackButtonVisibilityToVisibilityConverter" />
-    <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-    <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
+    <converters:BackButtonVisibilityToVisibilityConverter x:Key="BackButtonVisibilityToVisibilityConverter"/>
+    <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+    <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter"/>
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewContentPresenter.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewContentPresenter.xaml
index b249c26c6..b9ef9ac5d 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewContentPresenter.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewContentPresenter.xaml
@@ -8,41 +8,53 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <ControlTemplate x:Key="DefaultNavigationViewContentPresenterControlTemplate" TargetType="{x:Type controls:NavigationViewContentPresenter}">
-        <ContentPresenter x:Name="PART_FrameCP" Margin="{TemplateBinding Padding}" />
+    <ControlTemplate x:Key="DefaultNavigationViewContentPresenterControlTemplate"
+                     TargetType="{x:Type controls:NavigationViewContentPresenter}"
+                     >
+        <ContentPresenter x:Name="PART_FrameCP"
+                          Margin="{TemplateBinding Padding}"
+                          />
     </ControlTemplate>
 
-    <ControlTemplate x:Key="DefaultNavigationViewContentPresenterWithDynamicScrollViewerControlTemplate" TargetType="{x:Type controls:NavigationViewContentPresenter}">
-        <controls:DynamicScrollViewer
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch"
-            Focusable="False">
-            <ContentPresenter x:Name="PART_FrameCP" Margin="{TemplateBinding Padding}" />
+    <ControlTemplate x:Key="DefaultNavigationViewContentPresenterWithDynamicScrollViewerControlTemplate"
+                     TargetType="{x:Type controls:NavigationViewContentPresenter}"
+                     >
+        <controls:DynamicScrollViewer HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Stretch"
+                                      Focusable="False"
+                                      >
+            <ContentPresenter x:Name="PART_FrameCP"
+                              Margin="{TemplateBinding Padding}"
+                              />
         </controls:DynamicScrollViewer>
     </ControlTemplate>
 
-    <Style x:Key="DefaultNavigationViewContentPresenterStyle" TargetType="{x:Type controls:NavigationViewContentPresenter}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="JournalOwnership" Value="OwnsJournal" />
+    <Style x:Key="DefaultNavigationViewContentPresenterStyle"
+           TargetType="{x:Type controls:NavigationViewContentPresenter}"
+           >
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="JournalOwnership" Value="OwnsJournal"/>
 
         <Style.Triggers>
             <Trigger Property="IsDynamicScrollViewerEnabled" Value="True">
-                <Setter Property="Template" Value="{StaticResource DefaultNavigationViewContentPresenterWithDynamicScrollViewerControlTemplate}" />
+                <Setter Property="Template" Value="{StaticResource DefaultNavigationViewContentPresenterWithDynamicScrollViewerControlTemplate}"/>
             </Trigger>
             <Trigger Property="IsDynamicScrollViewerEnabled" Value="False">
-                <Setter Property="Template" Value="{StaticResource DefaultNavigationViewContentPresenterControlTemplate}" />
+                <Setter Property="Template" Value="{StaticResource DefaultNavigationViewContentPresenterControlTemplate}"/>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultNavigationViewContentPresenterStyle}" TargetType="{x:Type controls:NavigationViewContentPresenter}" />
+    <Style BasedOn="{StaticResource DefaultNavigationViewContentPresenterStyle}"
+           TargetType="{x:Type controls:NavigationViewContentPresenter}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewItemDefaultStyle.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewItemDefaultStyle.xaml
index 18ab38dd4..548f98fe7 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewItemDefaultStyle.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewItemDefaultStyle.xaml
@@ -1,27 +1,29 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <!--  NavigationViewItem core style  -->
 
-    <Style x:Key="NavigationViewItemDefaultStyle" TargetType="{x:Type controls:NavigationViewItem}">
+    <Style x:Key="NavigationViewItemDefaultStyle"
+           TargetType="{x:Type controls:NavigationViewItem}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="Background" Value="{DynamicResource NavigationViewItemBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource NavigationViewItemForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource NavigationViewItemBorderBrush}" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
-        <Setter Property="Focusable" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="Background" Value="{DynamicResource NavigationViewItemBackground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource NavigationViewItemForeground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource NavigationViewItemBorderBrush}"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="True"/>
+        <Setter Property="Focusable" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewItemHeader.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewItemHeader.xaml
index cd6aba954..486050fc9 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewItemHeader.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewItemHeader.xaml
@@ -5,51 +5,51 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"
+                    >
 
     <Style TargetType="{x:Type controls:NavigationViewItemHeader}">
-        <Setter Property="Foreground" Value="{DynamicResource NavigationViewItemForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="0,12,0,0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource NavigationViewItemForeground}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="0,12,0,0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:NavigationViewItemHeader}">
-                    <Grid
-                        Margin="{TemplateBinding Margin}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}">
+                    <Grid Margin="{TemplateBinding Margin}"
+                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                          >
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
 
-                        <ContentPresenter
-                            x:Name="IconElement"
-                            Grid.Column="0"
-                            Margin="0,0,4,0"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding Icon}"
-                            TextElement.FontSize="{TemplateBinding FontSize}"
-                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                        <ContentPresenter x:Name="IconElement"
+                                          Grid.Column="0"
+                                          Margin="0,0,4,0"
+                                          VerticalAlignment="Center"
+                                          Content="{TemplateBinding Icon}"
+                                          TextElement.FontSize="{TemplateBinding FontSize}"
+                                          TextElement.Foreground="{TemplateBinding Foreground}"
+                                          />
 
-                        <TextBlock
-                            Grid.Column="1"
-                            FontSize="{TemplateBinding FontSize}"
-                            Foreground="{TemplateBinding Foreground}"
-                            Text="{TemplateBinding Text}" />
+                        <TextBlock Grid.Column="1"
+                                   FontSize="{TemplateBinding FontSize}"
+                                   Foreground="{TemplateBinding Foreground}"
+                                   Text="{TemplateBinding Text}"
+                                   />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="IconElement" Property="Margin" Value="0" />
-                            <Setter TargetName="IconElement" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="IconElement" Property="Margin" Value="0"/>
+                            <Setter TargetName="IconElement" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewItemSeparator.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewItemSeparator.xaml
index e5ec7f264..36a8acca3 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewItemSeparator.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewItemSeparator.xaml
@@ -5,27 +5,27 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Style TargetType="{x:Type controls:NavigationViewItemSeparator}">
-        <Setter Property="BorderBrush" Value="{DynamicResource NavigationViewItemSeparatorForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Margin" Value="0,4" />
-        <Setter Property="BorderThickness" Value="1,1,0,0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="BorderBrush" Value="{DynamicResource NavigationViewItemSeparatorForeground}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Margin" Value="0,4"/>
+        <Setter Property="BorderThickness" Value="1,1,0,0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:NavigationViewItemSeparator}">
-                    <Border
-                        Width="{TemplateBinding Width}"
-                        Margin="{TemplateBinding Margin}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}" />
+                    <Border Width="{TemplateBinding Width}"
+                            Margin="{TemplateBinding Margin}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewLeftMinimalCompact.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewLeftMinimalCompact.xaml
index c57065f4f..d938c5e94 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewLeftMinimalCompact.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewLeftMinimalCompact.xaml
@@ -1,159 +1,167 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewItemDefaultStyle.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewItemDefaultStyle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <ControlTemplate x:Key="LeftMinimalCompactNavigationViewItemTemplate" TargetType="{x:Type controls:NavigationViewItem}">
+    <ControlTemplate x:Key="LeftMinimalCompactNavigationViewItemTemplate"
+                     TargetType="{x:Type controls:NavigationViewItem}"
+                     >
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <Border
-                x:Name="MainBorder"
-                Grid.Row="0"
-                MinWidth="40"
-                MinHeight="40"
-                Margin="0"
-                Padding="0"
-                Background="Transparent"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="1"
-                CornerRadius="{TemplateBinding Border.CornerRadius}">
+            <Border x:Name="MainBorder"
+                    Grid.Row="0"
+                    MinWidth="40"
+                    MinHeight="40"
+                    Margin="0"
+                    Padding="0"
+                    Background="Transparent"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="1"
+                    CornerRadius="{TemplateBinding Border.CornerRadius}"
+                    >
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="40" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="40"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
                     <Grid Grid.Column="0">
-                        <ContentControl
-                            x:Name="IconContentPresenter"
-                            Margin="-1,0,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding Icon}"
-                            Foreground="{DynamicResource NavigationViewItemForeground}" />
+                        <ContentControl x:Name="IconContentPresenter"
+                                        Margin="-1,0,0,0"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Content="{TemplateBinding Icon}"
+                                        Foreground="{DynamicResource NavigationViewItemForeground}"
+                                        />
                     </Grid>
 
-                    <Rectangle
-                        x:Name="ActiveRectangle"
-                        Grid.Column="0"
-                        Width="3"
-                        Height="16"
-                        Margin="0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
-                        Opacity="0.0"
-                        RadiusX="2"
-                        RadiusY="2" />
+                    <Rectangle x:Name="ActiveRectangle"
+                               Grid.Column="0"
+                               Width="3"
+                               Height="16"
+                               Margin="0"
+                               HorizontalAlignment="Left"
+                               VerticalAlignment="Center"
+                               Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
+                               Opacity="0.0"
+                               RadiusX="2"
+                               RadiusY="2"
+                               />
 
-                    <ContentPresenter
-                        x:Name="ElementContentPresenter"
-                        Grid.Column="1"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Content="{TemplateBinding Content}"
-                        TextElement.FontSize="14"
-                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                    <ContentPresenter x:Name="ElementContentPresenter"
+                                      Grid.Column="1"
+                                      HorizontalAlignment="Left"
+                                      VerticalAlignment="Center"
+                                      Content="{TemplateBinding Content}"
+                                      TextElement.FontSize="14"
+                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                      />
 
-                    <ContentPresenter
-                        x:Name="PART_InfoBadge"
-                        Grid.Column="2"
-                        Margin="0"
-                        Content="{TemplateBinding InfoBadge}" />
+                    <ContentPresenter x:Name="PART_InfoBadge"
+                                      Grid.Column="2"
+                                      Margin="0"
+                                      Content="{TemplateBinding InfoBadge}"
+                                      />
 
-                    <controls:SymbolIcon
-                        x:Name="ChevronIcon"
-                        Grid.Column="3"
-                        Symbol="ChevronDown24"
-                        Visibility="Collapsed" />
+                    <controls:SymbolIcon x:Name="ChevronIcon"
+                                         Grid.Column="3"
+                                         Symbol="ChevronDown24"
+                                         Visibility="Collapsed"
+                                         />
                 </Grid>
             </Border>
-            <ItemsControl
-                Grid.Row="1"
-                Focusable="False"
-                ItemsSource="{TemplateBinding MenuItemsSource}"
-                KeyboardNavigation.DirectionalNavigation="Contained"
-                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                ScrollViewer.VerticalScrollBarVisibility="Disabled">
+            <ItemsControl Grid.Row="1"
+                          Focusable="False"
+                          ItemsSource="{TemplateBinding MenuItemsSource}"
+                          KeyboardNavigation.DirectionalNavigation="Contained"
+                          ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                          ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                          >
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <StackPanel Margin="0" IsItemsHost="True" />
+                        <StackPanel Margin="0"
+                                    IsItemsHost="True"
+                                    />
                     </ItemsPanelTemplate>
                 </ItemsControl.ItemsPanel>
                 <ItemsControl.Resources>
-                    <Style BasedOn="{StaticResource NavigationViewItemDefaultStyle}" TargetType="{x:Type controls:NavigationViewItem}">
+                    <Style BasedOn="{StaticResource NavigationViewItemDefaultStyle}"
+                           TargetType="{x:Type controls:NavigationViewItem}"
+                           >
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="{x:Type controls:NavigationViewItem}">
-                                    <Border
-                                        x:Name="MainBorder"
-                                        Grid.Row="0"
-                                        MinHeight="40"
-                                        Margin="0"
-                                        Padding="0"
-                                        Background="Transparent"
-                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                        BorderThickness="1"
-                                        CornerRadius="{TemplateBinding Border.CornerRadius}">
+                                    <Border x:Name="MainBorder"
+                                            Grid.Row="0"
+                                            MinHeight="40"
+                                            Margin="0"
+                                            Padding="0"
+                                            Background="Transparent"
+                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                            BorderThickness="1"
+                                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                            >
                                         <Grid>
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="40" />
-                                                <ColumnDefinition Width="*" MinWidth="180" />
-                                                <ColumnDefinition Width="Auto" />
-                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="40"/>
+                                                <ColumnDefinition Width="*"
+                                                                  MinWidth="180"
+                                                                  />
+                                                <ColumnDefinition Width="Auto"/>
+                                                <ColumnDefinition Width="Auto"/>
                                             </Grid.ColumnDefinitions>
 
                                             <Grid Grid.Column="0">
-                                                <ContentPresenter
-                                                    x:Name="IconContentPresenter"
-                                                    Margin="-1,0,0,0"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    Content="{TemplateBinding Icon}"
-                                                    TextElement.Foreground="{DynamicResource NavigationViewItemForeground}" />
+                                                <ContentPresenter x:Name="IconContentPresenter"
+                                                                  Margin="-1,0,0,0"
+                                                                  HorizontalAlignment="Center"
+                                                                  VerticalAlignment="Center"
+                                                                  Content="{TemplateBinding Icon}"
+                                                                  TextElement.Foreground="{DynamicResource NavigationViewItemForeground}"
+                                                                  />
                                             </Grid>
 
-                                            <Rectangle
-                                                x:Name="ActiveRectangle"
-                                                Grid.Column="0"
-                                                Width="3"
-                                                Height="16"
-                                                Margin="0"
-                                                HorizontalAlignment="Left"
-                                                VerticalAlignment="Center"
-                                                Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
-                                                Opacity="0.0"
-                                                RadiusX="2"
-                                                RadiusY="2" />
+                                            <Rectangle x:Name="ActiveRectangle"
+                                                       Grid.Column="0"
+                                                       Width="3"
+                                                       Height="16"
+                                                       Margin="0"
+                                                       HorizontalAlignment="Left"
+                                                       VerticalAlignment="Center"
+                                                       Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
+                                                       Opacity="0.0"
+                                                       RadiusX="2"
+                                                       RadiusY="2"
+                                                       />
 
-                                            <ContentPresenter
-                                                x:Name="ElementContentPresenter"
-                                                Grid.Column="1"
-                                                HorizontalAlignment="Left"
-                                                VerticalAlignment="Center"
-                                                Content="{TemplateBinding Content}"
-                                                TextElement.FontSize="14"
-                                                TextElement.Foreground="{TemplateBinding Foreground}" />
+                                            <ContentPresenter x:Name="ElementContentPresenter"
+                                                              Grid.Column="1"
+                                                              HorizontalAlignment="Left"
+                                                              VerticalAlignment="Center"
+                                                              Content="{TemplateBinding Content}"
+                                                              TextElement.FontSize="14"
+                                                              TextElement.Foreground="{TemplateBinding Foreground}"
+                                                              />
 
-                                            <ContentPresenter
-                                                x:Name="PART_InfoBadge"
-                                                Grid.Column="2"
-                                                Margin="0"
-                                                Content="{TemplateBinding InfoBadge}" />
+                                            <ContentPresenter x:Name="PART_InfoBadge"
+                                                              Grid.Column="2"
+                                                              Margin="0"
+                                                              Content="{TemplateBinding InfoBadge}"
+                                                              />
 
-                                            <controls:SymbolIcon
-                                                x:Name="ChevronIcon"
-                                                Grid.Column="3"
-                                                Symbol="ChevronDown24"
-                                                Visibility="Collapsed" />
+                                            <controls:SymbolIcon x:Name="ChevronIcon"
+                                                                 Grid.Column="3"
+                                                                 Symbol="ChevronDown24"
+                                                                 Visibility="Collapsed"
+                                                                 />
                                         </Grid>
                                     </Border>
                                 </ControlTemplate>
@@ -165,38 +173,38 @@
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsPaneOpen" Value="True">
-                <Setter TargetName="PART_InfoBadge" Property="Grid.Column" Value="2" />
+                <Setter TargetName="PART_InfoBadge" Property="Grid.Column" Value="2"/>
             </Trigger>
             <Trigger Property="IsPaneOpen" Value="False">
-                <Setter TargetName="PART_InfoBadge" Property="Grid.Column" Value="0" />
-                <Setter TargetName="PART_InfoBadge" Property="VerticalAlignment" Value="Top" />
-                <Setter TargetName="PART_InfoBadge" Property="HorizontalAlignment" Value="Right" />
+                <Setter TargetName="PART_InfoBadge" Property="Grid.Column" Value="0"/>
+                <Setter TargetName="PART_InfoBadge" Property="VerticalAlignment" Value="Top"/>
+                <Setter TargetName="PART_InfoBadge" Property="HorizontalAlignment" Value="Right"/>
             </Trigger>
 
             <Trigger Property="HasMenuItems" Value="True">
-                <Setter TargetName="ChevronIcon" Property="Visibility" Value="Visible" />
-                <Setter TargetName="ChevronIcon" Property="Margin" Value="8,0,8,0" />
+                <Setter TargetName="ChevronIcon" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="ChevronIcon" Property="Margin" Value="8,0,8,0"/>
             </Trigger>
             <Trigger Property="IsActive" Value="True">
-                <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
-                <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelected}" />
+                <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0"/>
+                <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelected}"/>
                 <!--<Setter TargetName="IconContentPresenter" Property="Filled" Value="True" /> -->
                 <!--<Setter TargetName="IconContentPresenter" Property="Foreground" Value="{DynamicResource NavigationViewSelectionIndicatorForeground}" />-->
             </Trigger>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="IconContentPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="IconContentPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPointerOver}" />
+                <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPointerOver}"/>
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsMouseOver" Value="True" />
-                    <Condition Property="IsActive" Value="False" />
+                    <Condition Property="IsMouseOver" Value="True"/>
+                    <Condition Property="IsActive" Value="False"/>
                 </MultiTrigger.Conditions>
                 <MultiTrigger.Setters>
-                    <Setter TargetName="IconContentPresenter" Property="Foreground" Value="{DynamicResource NavigationViewItemForeground}" />
-                    <Setter TargetName="ElementContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewItemForeground}" />
+                    <Setter TargetName="IconContentPresenter" Property="Foreground" Value="{DynamicResource NavigationViewItemForeground}"/>
+                    <Setter TargetName="ElementContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewItemForeground}"/>
                 </MultiTrigger.Setters>
             </MultiTrigger>
         </ControlTemplate.Triggers>
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewTop.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewTop.xaml
index e3b03b088..0ee6eaf48 100644
--- a/src/Wpf.Ui/Controls/NavigationView/NavigationViewTop.xaml
+++ b/src/Wpf.Ui/Controls/NavigationView/NavigationViewTop.xaml
@@ -1,88 +1,94 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+                    >
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewItemDefaultStyle.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewConstants.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewItemDefaultStyle.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewConstants.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <ControlTemplate x:Key="TopNavigationViewTemplate" TargetType="{x:Type controls:NavigationView}">
+    <ControlTemplate x:Key="TopNavigationViewTemplate"
+                     TargetType="{x:Type controls:NavigationView}"
+                     >
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
 
-            <Grid x:Name="PaneGrid" Grid.Row="0">
+            <Grid x:Name="PaneGrid"
+                  Grid.Row="0"
+                  >
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
 
-                <controls:Button
-                    x:Name="PART_BackButton"
-                    Grid.Column="0"
-                    IsEnabled="{TemplateBinding IsBackEnabled}"
-                    Style="{StaticResource BasePaneButtonStyle}"
-                    Visibility="{TemplateBinding IsBackButtonVisible,
-                                                 Converter={StaticResource BackButtonVisibilityToVisibilityConverter}}">
+                <controls:Button x:Name="PART_BackButton"
+                                 Grid.Column="0"
+                                 IsEnabled="{TemplateBinding IsBackEnabled}"
+                                 Style="{StaticResource BasePaneButtonStyle}"
+                                 Visibility="{TemplateBinding IsBackButtonVisible,
+                                                              Converter={StaticResource BackButtonVisibilityToVisibilityConverter}}"
+                                 >
                     <controls:Button.Icon>
-                        <controls:SymbolIcon Symbol="ArrowLeft48" />
+                        <controls:SymbolIcon Symbol="ArrowLeft48"/>
                     </controls:Button.Icon>
                 </controls:Button>
 
                 <!--  Pane header  -->
-                <ContentPresenter
-                    Grid.Column="1"
-                    Margin="0"
-                    Content="{TemplateBinding PaneHeader}" />
+                <ContentPresenter Grid.Column="1"
+                                  Margin="0"
+                                  Content="{TemplateBinding PaneHeader}"
+                                  />
 
-                <ItemsControl
-                    x:Name="PART_MenuItemsItemsControl"
-                    Grid.Column="2"
-                    Focusable="False"
-                    KeyboardNavigation.DirectionalNavigation="Contained"
-                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                    ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                <ItemsControl x:Name="PART_MenuItemsItemsControl"
+                              Grid.Column="2"
+                              Focusable="False"
+                              KeyboardNavigation.DirectionalNavigation="Contained"
+                              ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                              ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                              >
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                            <StackPanel
-                                Margin="0"
-                                IsItemsHost="True"
-                                Orientation="Horizontal" />
+                            <StackPanel Margin="0"
+                                        IsItemsHost="True"
+                                        Orientation="Horizontal"
+                                        />
                         </ItemsPanelTemplate>
                     </ItemsControl.ItemsPanel>
                 </ItemsControl>
 
                 <!--  Auto Suggest Box  -->
-                <ContentPresenter Grid.Column="3" Content="{TemplateBinding AutoSuggestBox}" />
+                <ContentPresenter Grid.Column="3"
+                                  Content="{TemplateBinding AutoSuggestBox}"
+                                  />
 
                 <!--  Pane footer  -->
-                <ContentPresenter
-                    Grid.Column="4"
-                    Margin="0"
-                    Content="{TemplateBinding PaneFooter}" />
+                <ContentPresenter Grid.Column="4"
+                                  Margin="0"
+                                  Content="{TemplateBinding PaneFooter}"
+                                  />
 
-                <ItemsControl
-                    x:Name="PART_FooterMenuItemsItemsControl"
-                    Grid.Column="5"
-                    Focusable="False"
-                    KeyboardNavigation.DirectionalNavigation="Contained"
-                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                    ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                <ItemsControl x:Name="PART_FooterMenuItemsItemsControl"
+                              Grid.Column="5"
+                              Focusable="False"
+                              KeyboardNavigation.DirectionalNavigation="Contained"
+                              ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                              ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                              >
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                            <StackPanel
-                                Margin="0"
-                                IsItemsHost="True"
-                                Orientation="Horizontal" />
+                            <StackPanel Margin="0"
+                                        IsItemsHost="True"
+                                        Orientation="Horizontal"
+                                        />
                         </ItemsPanelTemplate>
                     </ItemsControl.ItemsPanel>
                 </ItemsControl>
@@ -90,208 +96,218 @@
 
             <Grid Grid.Row="1">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
 
                 <!--  Header  -->
-                <ContentPresenter
-                    Grid.Row="0"
-                    Margin="0"
-                    Content="{TemplateBinding Header}"
-                    Visibility="{TemplateBinding HeaderVisibility}" />
+                <ContentPresenter Grid.Row="0"
+                                  Margin="0"
+                                  Content="{TemplateBinding Header}"
+                                  Visibility="{TemplateBinding HeaderVisibility}"
+                                  />
 
                 <!--  Page content  -->
-                <controls:NavigationViewContentPresenter
-                    x:Name="PART_NavigationViewContentPresenter"
-                    Grid.Row="1"
-                    Padding="{TemplateBinding Padding}"
-                    Transition="{TemplateBinding Transition}"
-                    TransitionDuration="{TemplateBinding TransitionDuration}" />
+                <controls:NavigationViewContentPresenter x:Name="PART_NavigationViewContentPresenter"
+                                                         Grid.Row="1"
+                                                         Padding="{TemplateBinding Padding}"
+                                                         Transition="{TemplateBinding Transition}"
+                                                         TransitionDuration="{TemplateBinding TransitionDuration}"
+                                                         />
 
                 <!--  Overlay  -->
-                <ContentPresenter
-                    Grid.Row="0"
-                    Grid.RowSpan="2"
-                    Margin="0"
-                    Content="{TemplateBinding ContentOverlay}" />
+                <ContentPresenter Grid.Row="0"
+                                  Grid.RowSpan="2"
+                                  Margin="0"
+                                  Content="{TemplateBinding ContentOverlay}"
+                                  />
             </Grid>
         </Grid>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="TopCompactNavigationViewItemTemplate" TargetType="{x:Type controls:NavigationViewItem}">
+    <ControlTemplate x:Key="TopCompactNavigationViewItemTemplate"
+                     TargetType="{x:Type controls:NavigationViewItem}"
+                     >
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <Border x:Name="MainBorder">
                 <Grid>
-                    <Grid
-                        Margin="8,8,8,8"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch">
+                    <Grid Margin="8,8,8,8"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Stretch"
+                          >
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
-                        <ContentPresenter
-                            x:Name="IconContentPresenter"
-                            Grid.Column="0"
-                            Margin="0,0,6,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding Icon}"
-                            TextElement.FontSize="16"
-                            TextElement.Foreground="{DynamicResource NavigationViewItemForeground}" />
+                        <ContentPresenter x:Name="IconContentPresenter"
+                                          Grid.Column="0"
+                                          Margin="0,0,6,0"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          Content="{TemplateBinding Icon}"
+                                          TextElement.FontSize="16"
+                                          TextElement.Foreground="{DynamicResource NavigationViewItemForeground}"
+                                          />
 
-                        <ContentPresenter
-                            x:Name="ElementContentPresenter"
-                            Grid.Column="1"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding Content}"
-                            TextElement.FontSize="14"
-                            TextElement.Foreground="{TemplateBinding Foreground}" />
-                        <Grid
-                            x:Name="PART_ChevronGrid"
-                            Grid.Column="2"
-                            Width="0"
-                            Visibility="Collapsed" />
+                        <ContentPresenter x:Name="ElementContentPresenter"
+                                          Grid.Column="1"
+                                          HorizontalAlignment="Left"
+                                          VerticalAlignment="Center"
+                                          Content="{TemplateBinding Content}"
+                                          TextElement.FontSize="14"
+                                          TextElement.Foreground="{TemplateBinding Foreground}"
+                                          />
+                        <Grid x:Name="PART_ChevronGrid"
+                              Grid.Column="2"
+                              Width="0"
+                              Visibility="Collapsed"
+                              />
 
-                        <ContentPresenter
-                            x:Name="PART_InfoBadge"
-                            Grid.Column="2"
-                            Margin="2"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding InfoBadge}" />
+                        <ContentPresenter x:Name="PART_InfoBadge"
+                                          Grid.Column="2"
+                                          Margin="2"
+                                          HorizontalAlignment="Right"
+                                          VerticalAlignment="Center"
+                                          Content="{TemplateBinding InfoBadge}"
+                                          />
                     </Grid>
-                    <Rectangle
-                        x:Name="ActiveRectangle"
-                        Grid.Column="0"
-                        Width="16"
-                        Height="3"
-                        Margin="0,0,0,-4"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Bottom"
-                        Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
-                        Opacity="0.0"
-                        RadiusX="2"
-                        RadiusY="2" />
+                    <Rectangle x:Name="ActiveRectangle"
+                               Grid.Column="0"
+                               Width="16"
+                               Height="3"
+                               Margin="0,0,0,-4"
+                               HorizontalAlignment="Center"
+                               VerticalAlignment="Bottom"
+                               Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
+                               Opacity="0.0"
+                               RadiusX="2"
+                               RadiusY="2"
+                               />
 
                 </Grid>
             </Border>
-            <Popup
-                x:Name="SubMenuPopup"
-                Grid.Row="1"
-                AllowsTransparency="True"
-                Focusable="False"
-                HorizontalOffset="-12"
-                IsOpen="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                Placement="Bottom"
-                PlacementTarget="{Binding ElementName=MainBorder}"
-                PopupAnimation="None"
-                StaysOpen="False"
-                VerticalOffset="1">
+            <Popup x:Name="SubMenuPopup"
+                   Grid.Row="1"
+                   AllowsTransparency="True"
+                   Focusable="False"
+                   HorizontalOffset="-12"
+                   IsOpen="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                   Placement="Bottom"
+                   PlacementTarget="{Binding ElementName=MainBorder}"
+                   PopupAnimation="None"
+                   StaysOpen="False"
+                   VerticalOffset="1"
+                   >
 
-                <Border
-                    x:Name="SubMenuBorder"
-                    Margin="12,0,12,18"
-                    Padding="0,3,0,3"
-                    Background="{DynamicResource FlyoutBackground}"
-                    BorderBrush="{DynamicResource FlyoutBorderBrush}"
-                    BorderThickness="1"
-                    CornerRadius="8"
-                    SnapsToDevicePixels="True">
+                <Border x:Name="SubMenuBorder"
+                        Margin="12,0,12,18"
+                        Padding="0,3,0,3"
+                        Background="{DynamicResource FlyoutBackground}"
+                        BorderBrush="{DynamicResource FlyoutBorderBrush}"
+                        BorderThickness="1"
+                        CornerRadius="8"
+                        SnapsToDevicePixels="True"
+                        >
                     <Border.RenderTransform>
-                        <TranslateTransform />
+                        <TranslateTransform/>
                     </Border.RenderTransform>
                     <Border.Effect>
-                        <DropShadowEffect
-                            BlurRadius="20"
-                            Direction="270"
-                            Opacity="0.25"
-                            ShadowDepth="6" />
+                        <DropShadowEffect BlurRadius="20"
+                                          Direction="270"
+                                          Opacity="0.25"
+                                          ShadowDepth="6"
+                                          />
                     </Border.Effect>
 
-                    <ItemsControl
-                        x:Name="SubMenuItemsPresenter"
-                        Focusable="False"
-                        ItemsSource="{TemplateBinding MenuItems}"
-                        KeyboardNavigation.DirectionalNavigation="Contained"
-                        Opacity="0.0"
-                        ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                        ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                    <ItemsControl x:Name="SubMenuItemsPresenter"
+                                  Focusable="False"
+                                  ItemsSource="{TemplateBinding MenuItems}"
+                                  KeyboardNavigation.DirectionalNavigation="Contained"
+                                  Opacity="0.0"
+                                  ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                  ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                                  >
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <StackPanel Margin="0" IsItemsHost="True" />
+                                <StackPanel Margin="0"
+                                            IsItemsHost="True"
+                                            />
                             </ItemsPanelTemplate>
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.Resources>
-                            <Style BasedOn="{StaticResource NavigationViewItemDefaultStyle}" TargetType="{x:Type controls:NavigationViewItem}">
+                            <Style BasedOn="{StaticResource NavigationViewItemDefaultStyle}"
+                                   TargetType="{x:Type controls:NavigationViewItem}"
+                                   >
                                 <Setter Property="Template">
                                     <Setter.Value>
                                         <ControlTemplate TargetType="{x:Type controls:NavigationViewItem}">
-                                            <Border
-                                                x:Name="MainBorder"
-                                                Height="25"
-                                                Margin="0"
-                                                Padding="0"
-                                                HorizontalAlignment="Stretch"
-                                                BorderThickness="1"
-                                                CornerRadius="4">
-                                                <Grid Margin="0" HorizontalAlignment="Stretch">
+                                            <Border x:Name="MainBorder"
+                                                    Height="25"
+                                                    Margin="0"
+                                                    Padding="0"
+                                                    HorizontalAlignment="Stretch"
+                                                    BorderThickness="1"
+                                                    CornerRadius="4"
+                                                    >
+                                                <Grid Margin="0"
+                                                      HorizontalAlignment="Stretch"
+                                                      >
                                                     <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="3" />
-                                                        <ColumnDefinition Width="15" />
-                                                        <ColumnDefinition Width="*" MinWidth="120" />
+                                                        <ColumnDefinition Width="3"/>
+                                                        <ColumnDefinition Width="15"/>
+                                                        <ColumnDefinition Width="*"
+                                                                          MinWidth="120"
+                                                                          />
                                                     </Grid.ColumnDefinitions>
-                                                    <Rectangle
-                                                        x:Name="ActiveRectangle"
-                                                        Grid.Column="0"
-                                                        Width="3"
-                                                        Height="16"
-                                                        Margin="0"
-                                                        HorizontalAlignment="Left"
-                                                        VerticalAlignment="Center"
-                                                        Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
-                                                        Opacity="0.0"
-                                                        RadiusX="2"
-                                                        RadiusY="2" />
+                                                    <Rectangle x:Name="ActiveRectangle"
+                                                               Grid.Column="0"
+                                                               Width="3"
+                                                               Height="16"
+                                                               Margin="0"
+                                                               HorizontalAlignment="Left"
+                                                               VerticalAlignment="Center"
+                                                               Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
+                                                               Opacity="0.0"
+                                                               RadiusX="2"
+                                                               RadiusY="2"
+                                                               />
 
-                                                    <ContentPresenter
-                                                        x:Name="IconContentPresenter"
-                                                        Grid.Column="1"
-                                                        Margin="0,0,0,0"
-                                                        HorizontalAlignment="Center"
-                                                        VerticalAlignment="Center"
-                                                        Content="{TemplateBinding Icon}"
-                                                        Focusable="False"
-                                                        TextElement.FontSize="16"
-                                                        TextElement.Foreground="{DynamicResource NavigationViewItemForeground}" />
-                                                    <ContentPresenter
-                                                        x:Name="ElementContentPresenter"
-                                                        Grid.Column="2"
-                                                        Margin="5,0,0,0"
-                                                        HorizontalAlignment="Stretch"
-                                                        VerticalAlignment="Center"
-                                                        Content="{TemplateBinding Content}"
-                                                        TextElement.FontSize="14"
-                                                        TextElement.Foreground="{DynamicResource NavigationViewItemForeground}" />
+                                                    <ContentPresenter x:Name="IconContentPresenter"
+                                                                      Grid.Column="1"
+                                                                      Margin="0,0,0,0"
+                                                                      HorizontalAlignment="Center"
+                                                                      VerticalAlignment="Center"
+                                                                      Content="{TemplateBinding Icon}"
+                                                                      Focusable="False"
+                                                                      TextElement.FontSize="16"
+                                                                      TextElement.Foreground="{DynamicResource NavigationViewItemForeground}"
+                                                                      />
+                                                    <ContentPresenter x:Name="ElementContentPresenter"
+                                                                      Grid.Column="2"
+                                                                      Margin="5,0,0,0"
+                                                                      HorizontalAlignment="Stretch"
+                                                                      VerticalAlignment="Center"
+                                                                      Content="{TemplateBinding Content}"
+                                                                      TextElement.FontSize="14"
+                                                                      TextElement.Foreground="{DynamicResource NavigationViewItemForeground}"
+                                                                      />
                                                 </Grid>
                                             </Border>
                                             <ControlTemplate.Triggers>
                                                 <Trigger Property="IsActive" Value="True">
-                                                    <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
-                                                    <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelected}" />
+                                                    <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0"/>
+                                                    <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelected}"/>
                                                 </Trigger>
                                                 <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPointerOver}" />
+                                                    <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPointerOver}"/>
                                                 </Trigger>
                                                 <Trigger Property="IsPressed" Value="True">
-                                                    <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPressed}" />
+                                                    <Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPressed}"/>
                                                 </Trigger>
                                             </ControlTemplate.Triggers>
                                         </ControlTemplate>
@@ -306,20 +322,20 @@
         <ControlTemplate.Triggers>
 
             <Trigger Property="HasMenuItems" Value="True">
-                <Setter TargetName="PART_ChevronGrid" Property="Visibility" Value="Visible" />
-                <Setter TargetName="PART_ChevronGrid" Property="Width" Value="20" />
+                <Setter TargetName="PART_ChevronGrid" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="PART_ChevronGrid" Property="Width" Value="20"/>
             </Trigger>
             <Trigger Property="IsExpanded" Value="True">
 
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="SubMenuItemsPresenter"
-                                Storyboard.TargetProperty="(UIElement.Opacity)"
-                                From="0.0"
-                                To="1.0"
-                                Duration="0:0:0.167" />
+                            <DoubleAnimation Storyboard.TargetName="SubMenuItemsPresenter"
+                                             Storyboard.TargetProperty="(UIElement.Opacity)"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="0:0:0.167"
+                                             />
                             <!--<DoubleAnimation
                                 Storyboard.TargetName="ChevronIcon"
                                 Storyboard.TargetProperty="(Control.RenderTransform).(RotateTransform.Angle)"
@@ -331,12 +347,12 @@
                 <Trigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="SubMenuItemsPresenter"
-                                Storyboard.TargetProperty="(UIElement.Opacity)"
-                                From="1.0"
-                                To="0.0"
-                                Duration="0:0:0.167" />
+                            <DoubleAnimation Storyboard.TargetName="SubMenuItemsPresenter"
+                                             Storyboard.TargetProperty="(UIElement.Opacity)"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="0:0:0.167"
+                                             />
 
                             <!--<DoubleAnimation
                                 Storyboard.TargetName="ChevronIcon"
@@ -348,18 +364,18 @@
                 </Trigger.ExitActions>
             </Trigger>
             <Trigger Property="IsActive" Value="True">
-                <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
+                <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0"/>
             </Trigger>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="IconContentPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="IconContentPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="Content" Value="{x:Null}">
-                <Setter TargetName="IconContentPresenter" Property="Margin" Value="0" />
-                <Setter TargetName="ElementContentPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="IconContentPresenter" Property="Margin" Value="0"/>
+                <Setter TargetName="ElementContentPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="Content" Value="">
-                <Setter TargetName="IconContentPresenter" Property="Margin" Value="0" />
-                <Setter TargetName="ElementContentPresenter" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="IconContentPresenter" Property="Margin" Value="0"/>
+                <Setter TargetName="ElementContentPresenter" Property="Visibility" Value="Collapsed"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
index 58f36f9a1..8073d99fd 100644
--- a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
+++ b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
@@ -8,11 +8,11 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"
+                    >
 
     <Thickness x:Key="NumberBoxBorderThemeThickness">1,1,1,0</Thickness>
     <Thickness x:Key="NumberBoxAccentBorderThemeThickness">0,0,0,1</Thickness>
@@ -23,239 +23,253 @@
     <system:Double x:Key="NumberBoxButtonHeight">24</system:Double>
     <system:Double x:Key="NumberBoxButtonIconSize">14</system:Double>
 
-    <Style x:Key="DefaultUiNumberBoxStyle" TargetType="{x:Type controls:NumberBox}">
+    <Style x:Key="DefaultUiNumberBoxStyle"
+           TargetType="{x:Type controls:NumberBox}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}"/>
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-        <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />
-        <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource NumberBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="ClearButtonEnabled" Value="True" />
-        <Setter Property="IconPlacement" Value="Left" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}"/>
+        <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource TextControlBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource NumberBoxBorderThemeThickness}"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}"/>
+        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}"/>
+        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="ClearButtonEnabled" Value="True"/>
+        <Setter Property="IconPlacement" Value="Left"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:NumberBox}">
-                    <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                        <Border
-                            x:Name="ContentBorder"
-                            Width="{TemplateBinding Width}"
-                            Height="{TemplateBinding Height}"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            Padding="0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}">
-                            <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                          >
+                        <Border x:Name="ContentBorder"
+                                Width="{TemplateBinding Width}"
+                                Height="{TemplateBinding Height}"
+                                MinWidth="{TemplateBinding MinWidth}"
+                                MinHeight="{TemplateBinding MinHeight}"
+                                Padding="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                >
+                            <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  >
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <ContentControl
-                                    x:Name="ControlIconLeft"
-                                    Grid.Column="0"
-                                    Margin="{StaticResource NumberBoxLeftIconMargin}"
-                                    Padding="0"
-                                    VerticalAlignment="Top"
-                                    Content="{TemplateBinding Icon}"
-                                    FontSize="16"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    IsTabStop="False" />
-                                <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
-                                    <controls:PassiveScrollViewer
-                                        x:Name="PART_ContentHost"
-                                        Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
-                                        TextElement.Foreground="{TemplateBinding Foreground}" />
-                                    <TextBlock
-                                        x:Name="PlaceholderTextBox"
-                                        Margin="0"
-                                        Padding="1,0"
-                                        VerticalAlignment="Top"
-                                        Foreground="{DynamicResource TextControlPlaceholderForeground}"
-                                        Text="{TemplateBinding PlaceholderText}" />
+                                <ContentControl x:Name="ControlIconLeft"
+                                                Grid.Column="0"
+                                                Margin="{StaticResource NumberBoxLeftIconMargin}"
+                                                Padding="0"
+                                                VerticalAlignment="Top"
+                                                Content="{TemplateBinding Icon}"
+                                                FontSize="16"
+                                                Foreground="{TemplateBinding Foreground}"
+                                                IsTabStop="False"
+                                                />
+                                <Grid Grid.Column="1"
+                                      Margin="{TemplateBinding Padding}"
+                                      >
+                                    <controls:PassiveScrollViewer x:Name="PART_ContentHost"
+                                                                  Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
+                                                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                                                  />
+                                    <TextBlock x:Name="PlaceholderTextBox"
+                                               Margin="0"
+                                               Padding="1,0"
+                                               VerticalAlignment="Top"
+                                               Foreground="{DynamicResource TextControlPlaceholderForeground}"
+                                               Text="{TemplateBinding PlaceholderText}"
+                                               />
                                 </Grid>
                                 <!--  Buttons and Icons have no padding from the main element to allow absolute positions if height is larger than the text entry zone  -->
-                                <controls:Button
-                                    x:Name="ClearButton"
-                                    Grid.Column="2"
-                                    Width="{StaticResource NumberBoxButtonHeight}"
-                                    Height="{StaticResource NumberBoxButtonHeight}"
-                                    Margin="{StaticResource NumberBoxButtonMargin}"
-                                    Padding="{StaticResource NumberBoxButtonPadding}"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Top"
-                                    HorizontalContentAlignment="Center"
-                                    VerticalContentAlignment="Center"
-                                    Appearance="Secondary"
-                                    Background="Transparent"
-                                    BorderBrush="Transparent"
-                                    Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    CommandParameter="clear"
-                                    Cursor="Arrow"
-                                    Foreground="{DynamicResource TextControlButtonForeground}"
-                                    IsTabStop="False">
+                                <controls:Button x:Name="ClearButton"
+                                                 Grid.Column="2"
+                                                 Width="{StaticResource NumberBoxButtonHeight}"
+                                                 Height="{StaticResource NumberBoxButtonHeight}"
+                                                 Margin="{StaticResource NumberBoxButtonMargin}"
+                                                 Padding="{StaticResource NumberBoxButtonPadding}"
+                                                 HorizontalAlignment="Center"
+                                                 VerticalAlignment="Top"
+                                                 HorizontalContentAlignment="Center"
+                                                 VerticalContentAlignment="Center"
+                                                 Appearance="Secondary"
+                                                 Background="Transparent"
+                                                 BorderBrush="Transparent"
+                                                 Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 CommandParameter="clear"
+                                                 Cursor="Arrow"
+                                                 Foreground="{DynamicResource TextControlButtonForeground}"
+                                                 IsTabStop="False"
+                                                 >
                                     <controls:Button.Icon>
-                                        <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}" Symbol="Dismiss24" />
+                                        <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}"
+                                                             Symbol="Dismiss24"
+                                                             />
                                     </controls:Button.Icon>
                                 </controls:Button>
-                                <controls:Button
-                                    x:Name="InlineIncrementButton"
-                                    Grid.Column="3"
-                                    Width="{StaticResource NumberBoxButtonHeight}"
-                                    Height="{StaticResource NumberBoxButtonHeight}"
-                                    Margin="{StaticResource NumberBoxButtonMargin}"
-                                    Padding="{StaticResource NumberBoxButtonPadding}"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Top"
-                                    HorizontalContentAlignment="Center"
-                                    VerticalContentAlignment="Center"
-                                    Appearance="Secondary"
-                                    Background="Transparent"
-                                    BorderBrush="Transparent"
-                                    Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    CommandParameter="increment"
-                                    Cursor="Arrow"
-                                    Foreground="{DynamicResource TextControlButtonForeground}"
-                                    IsTabStop="False"
-                                    Visibility="Collapsed">
+                                <controls:Button x:Name="InlineIncrementButton"
+                                                 Grid.Column="3"
+                                                 Width="{StaticResource NumberBoxButtonHeight}"
+                                                 Height="{StaticResource NumberBoxButtonHeight}"
+                                                 Margin="{StaticResource NumberBoxButtonMargin}"
+                                                 Padding="{StaticResource NumberBoxButtonPadding}"
+                                                 HorizontalAlignment="Center"
+                                                 VerticalAlignment="Top"
+                                                 HorizontalContentAlignment="Center"
+                                                 VerticalContentAlignment="Center"
+                                                 Appearance="Secondary"
+                                                 Background="Transparent"
+                                                 BorderBrush="Transparent"
+                                                 Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 CommandParameter="increment"
+                                                 Cursor="Arrow"
+                                                 Foreground="{DynamicResource TextControlButtonForeground}"
+                                                 IsTabStop="False"
+                                                 Visibility="Collapsed"
+                                                 >
                                     <controls:Button.Icon>
-                                        <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}" Symbol="ChevronUp24" />
+                                        <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}"
+                                                             Symbol="ChevronUp24"
+                                                             />
                                     </controls:Button.Icon>
                                 </controls:Button>
-                                <controls:Button
-                                    x:Name="InlineDecrementButton"
-                                    Grid.Column="4"
-                                    Width="{StaticResource NumberBoxButtonHeight}"
-                                    Height="{StaticResource NumberBoxButtonHeight}"
-                                    Margin="{StaticResource NumberBoxButtonMargin}"
-                                    Padding="{StaticResource NumberBoxButtonPadding}"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Top"
-                                    HorizontalContentAlignment="Center"
-                                    VerticalContentAlignment="Center"
-                                    Appearance="Secondary"
-                                    Background="Transparent"
-                                    BorderBrush="Transparent"
-                                    Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    CommandParameter="decrement"
-                                    Cursor="Arrow"
-                                    FontSize="{StaticResource NumberBoxButtonIconSize}"
-                                    Foreground="{DynamicResource TextControlButtonForeground}"
-                                    IsTabStop="False"
-                                    Visibility="Collapsed">
+                                <controls:Button x:Name="InlineDecrementButton"
+                                                 Grid.Column="4"
+                                                 Width="{StaticResource NumberBoxButtonHeight}"
+                                                 Height="{StaticResource NumberBoxButtonHeight}"
+                                                 Margin="{StaticResource NumberBoxButtonMargin}"
+                                                 Padding="{StaticResource NumberBoxButtonPadding}"
+                                                 HorizontalAlignment="Center"
+                                                 VerticalAlignment="Top"
+                                                 HorizontalContentAlignment="Center"
+                                                 VerticalContentAlignment="Center"
+                                                 Appearance="Secondary"
+                                                 Background="Transparent"
+                                                 BorderBrush="Transparent"
+                                                 Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 CommandParameter="decrement"
+                                                 Cursor="Arrow"
+                                                 FontSize="{StaticResource NumberBoxButtonIconSize}"
+                                                 Foreground="{DynamicResource TextControlButtonForeground}"
+                                                 IsTabStop="False"
+                                                 Visibility="Collapsed"
+                                                 >
                                     <controls:Button.Icon>
-                                        <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}" Symbol="ChevronDown24" />
+                                        <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}"
+                                                             Symbol="ChevronDown24"
+                                                             />
                                     </controls:Button.Icon>
                                 </controls:Button>
-                                <ContentControl
-                                    x:Name="ControlIconRight"
-                                    Grid.Column="5"
-                                    Margin="{StaticResource NumberBoxRightIconMargin}"
-                                    Padding="0"
-                                    VerticalAlignment="Top"
-                                    Content="{TemplateBinding Icon}"
-                                    FontSize="16"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    IsTabStop="False" />
+                                <ContentControl x:Name="ControlIconRight"
+                                                Grid.Column="5"
+                                                Margin="{StaticResource NumberBoxRightIconMargin}"
+                                                Padding="0"
+                                                VerticalAlignment="Top"
+                                                Content="{TemplateBinding Icon}"
+                                                FontSize="16"
+                                                Foreground="{TemplateBinding Foreground}"
+                                                IsTabStop="False"
+                                                />
                             </Grid>
                         </Border>
                         <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
-                        <Border
-                            x:Name="AccentBorder"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
-                            BorderThickness="{StaticResource NumberBoxAccentBorderThemeThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}" />
+                        <Border x:Name="AccentBorder"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
+                                BorderThickness="{StaticResource NumberBoxAccentBorderThemeThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="CurrentPlaceholderEnabled" Value="False">
-                            <Setter TargetName="PlaceholderTextBox" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PlaceholderTextBox" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                         <Trigger Property="ShowClearButton" Value="False">
-                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ClearButton" Property="Margin" Value="0" />
+                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ClearButton" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="ClearButtonEnabled" Value="False">
-                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ClearButton" Property="Margin" Value="0" />
+                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ClearButton" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="SpinButtonPlacementMode" Value="Hidden">
-                            <Setter TargetName="InlineIncrementButton" Property="Margin" Value="0" />
-                            <Setter TargetName="InlineDecrementButton" Property="Margin" Value="0" />
+                            <Setter TargetName="InlineIncrementButton" Property="Margin" Value="0"/>
+                            <Setter TargetName="InlineDecrementButton" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="SpinButtonPlacementMode" Value="Inline">
-                            <Setter TargetName="InlineIncrementButton" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="InlineDecrementButton" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="InlineIncrementButton" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="InlineDecrementButton" Property="Visibility" Value="Visible"/>
                         </Trigger>
                         <Trigger Property="IconPlacement" Value="Left">
-                            <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ControlIconRight" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ControlIconRight" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="IconPlacement" Value="Right">
-                            <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ControlIconLeft" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ControlIconLeft" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ControlIconRight" Property="Margin" Value="0" />
-                            <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ControlIconLeft" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ControlIconRight" Property="Margin" Value="0"/>
+                            <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ControlIconLeft" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlFocusedBorderBrush}" />
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
+                            <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2"/>
+                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlFocusedBorderBrush}"/>
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsFocused" Value="False" />
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsFocused" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}"/>
                         </MultiTrigger>
                         <Trigger Property="IsReadOnly" Value="True">
-                            <Setter Property="SpinButtonPlacementMode" Value="Hidden" />
-                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ClearButton" Property="Margin" Value="0" />
+                            <Setter Property="SpinButtonPlacementMode" Value="Hidden"/>
+                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ClearButton" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="True">
-                            <Setter Property="Cursor" Value="IBeam" />
+                            <Setter Property="Cursor" Value="IBeam"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-                            <Setter TargetName="ControlIconLeft" Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                            <Setter TargetName="ControlIconRight" Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                            <Setter TargetName="PlaceholderTextBox" Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                            <Setter Property="ClearButtonEnabled" Value="False" />
-                            <Setter Property="SpinButtonPlacementMode" Value="Hidden" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}"/>
+                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}"/>
+                            <Setter TargetName="ControlIconLeft" Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
+                            <Setter TargetName="ControlIconRight" Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
+                            <Setter TargetName="PlaceholderTextBox" Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
+                            <Setter Property="ClearButtonEnabled" Value="False"/>
+                            <Setter Property="SpinButtonPlacementMode" Value="Hidden"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -263,6 +277,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiNumberBoxStyle}" TargetType="{x:Type controls:NumberBox}" />
+    <Style BasedOn="{StaticResource DefaultUiNumberBoxStyle}"
+           TargetType="{x:Type controls:NumberBox}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/Page/Page.xaml b/src/Wpf.Ui/Controls/Page/Page.xaml
index a90511aa5..0eb83b66f 100644
--- a/src/Wpf.Ui/Controls/Page/Page.xaml
+++ b/src/Wpf.Ui/Controls/Page/Page.xaml
@@ -5,35 +5,41 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
-    <Style x:Key="DefaultPageStyle" TargetType="{x:Type Page}">
+    <Style x:Key="DefaultPageStyle"
+           TargetType="{x:Type Page}"
+           >
         <Setter Property="Control.Foreground">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}"/>
             </Setter.Value>
         </Setter>
-        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Background" Value="Transparent"/>
         <!--  The Display option casues a large aliasing effect  -->
         <!-- <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" /> -->
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Page}">
                     <Grid>
-                        <ContentPresenter
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Content="{TemplateBinding ContentControl.Content}"
-                            TextElement.Foreground="{TemplateBinding Control.Foreground}" />
+                        <ContentPresenter HorizontalAlignment="Stretch"
+                                          VerticalAlignment="Stretch"
+                                          Content="{TemplateBinding ContentControl.Content}"
+                                          TextElement.Foreground="{TemplateBinding Control.Foreground}"
+                                          />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultPageStyle}" TargetType="{x:Type Page}" />
+    <Style BasedOn="{StaticResource DefaultPageStyle}"
+           TargetType="{x:Type Page}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
index 346b8a68d..a4a27ea2e 100644
--- a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
+++ b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
@@ -8,11 +8,11 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"
+                    >
 
     <Thickness x:Key="PasswordBoxBorderThemeThickness">1,1,1,0</Thickness>
     <Thickness x:Key="PasswordBoxAccentBorderThemeThickness">0,0,0,1</Thickness>
@@ -24,88 +24,92 @@
     <system:Double x:Key="PasswordBoxButtonIconSize">14</system:Double>
 
     <ContextMenu x:Key="DefaultPasswordBoxContextMenu">
-        <MenuItem Command="ApplicationCommands.Paste" />
+        <MenuItem Command="ApplicationCommands.Paste"/>
     </ContextMenu>
 
-    <Style x:Key="DefaultPasswordBoxStyle" TargetType="{x:Type PasswordBox}">
+    <Style x:Key="DefaultPasswordBoxStyle"
+           TargetType="{x:Type PasswordBox}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultPasswordBoxContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource DefaultPasswordBoxContextMenu}"/>
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-        <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />
-        <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource PasswordBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}"/>
+        <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource TextControlBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource PasswordBoxBorderThemeThickness}"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}"/>
+        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}"/>
+        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type PasswordBox}">
-                    <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                        <Border
-                            x:Name="ContentBorder"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            Padding="0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}">
-                            <Grid
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                <controls:PassiveScrollViewer
-                                    x:Name="PART_ContentHost"
-                                    Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                    <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                          >
+                        <Border x:Name="ContentBorder"
+                                MinWidth="{TemplateBinding MinWidth}"
+                                MinHeight="{TemplateBinding MinHeight}"
+                                Padding="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                >
+                            <Grid Margin="{TemplateBinding Padding}"
+                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  >
+                                <controls:PassiveScrollViewer x:Name="PART_ContentHost"
+                                                              Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
+                                                              TextElement.Foreground="{TemplateBinding Foreground}"
+                                                              />
                             </Grid>
                         </Border>
                         <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
-                        <Border
-                            x:Name="AccentBorder"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
-                            BorderThickness="{StaticResource PasswordBoxAccentBorderThemeThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}" />
+                        <Border x:Name="AccentBorder"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
+                                BorderThickness="{StaticResource PasswordBoxAccentBorderThemeThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlFocusedBorderBrush}" />
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
+                            <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2"/>
+                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlFocusedBorderBrush}"/>
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsFocused" Value="False" />
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsFocused" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}"/>
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="True">
-                            <Setter Property="Cursor" Value="IBeam" />
+                            <Setter Property="Cursor" Value="IBeam"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}"/>
+                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -113,211 +117,223 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultUiPasswordBoxStyle" TargetType="{x:Type controls:PasswordBox}">
+    <Style x:Key="DefaultUiPasswordBoxStyle"
+           TargetType="{x:Type controls:PasswordBox}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultPasswordBoxContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource DefaultPasswordBoxContextMenu}"/>
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-        <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />
-        <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource PasswordBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="ClearButtonEnabled" Value="True" />
-        <Setter Property="RevealButtonEnabled" Value="True" />
-        <Setter Property="IconPlacement" Value="Left" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}"/>
+        <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource TextControlBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource PasswordBoxBorderThemeThickness}"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}"/>
+        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}"/>
+        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="ClearButtonEnabled" Value="True"/>
+        <Setter Property="RevealButtonEnabled" Value="True"/>
+        <Setter Property="IconPlacement" Value="Left"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:PasswordBox}">
-                    <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                        <Border
-                            x:Name="ContentBorder"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            Padding="0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}">
-                            <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                          >
+                        <Border x:Name="ContentBorder"
+                                MinWidth="{TemplateBinding MinWidth}"
+                                MinHeight="{TemplateBinding MinHeight}"
+                                Padding="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                >
+                            <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  >
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
 
-                                <ContentPresenter
-                                    x:Name="ControlIconLeft"
-                                    Grid.Column="0"
-                                    Margin="{StaticResource PasswordBoxLeftIconMargin}"
-                                    VerticalAlignment="Top"
-                                    Content="{TemplateBinding Icon}"
-                                    TextElement.FontSize="16"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                                <ContentPresenter x:Name="ControlIconLeft"
+                                                  Grid.Column="0"
+                                                  Margin="{StaticResource PasswordBoxLeftIconMargin}"
+                                                  VerticalAlignment="Top"
+                                                  Content="{TemplateBinding Icon}"
+                                                  TextElement.FontSize="16"
+                                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                                  />
 
-                                <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
-                                    <controls:PassiveScrollViewer
-                                        x:Name="PART_ContentHost"
-                                        Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
-                                        TextElement.Foreground="{TemplateBinding Foreground}" />
-                                    <TextBlock
-                                        x:Name="PlaceholderTextBox"
-                                        Margin="0"
-                                        Padding="1,0"
-                                        VerticalAlignment="Top"
-                                        Foreground="{DynamicResource TextControlPlaceholderForeground}"
-                                        Text="{TemplateBinding PlaceholderText}" />
+                                <Grid Grid.Column="1"
+                                      Margin="{TemplateBinding Padding}"
+                                      >
+                                    <controls:PassiveScrollViewer x:Name="PART_ContentHost"
+                                                                  Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
+                                                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                                                  />
+                                    <TextBlock x:Name="PlaceholderTextBox"
+                                               Margin="0"
+                                               Padding="1,0"
+                                               VerticalAlignment="Top"
+                                               Foreground="{DynamicResource TextControlPlaceholderForeground}"
+                                               Text="{TemplateBinding PlaceholderText}"
+                                               />
                                 </Grid>
 
                                 <!--  Buttons and Icons have no padding from the main element to allow absolute positions if height is larger than the text entry zone  -->
-                                <controls:Button
-                                    x:Name="ClearButton"
-                                    Grid.Column="2"
-                                    Width="{StaticResource PasswordBoxButtonHeight}"
-                                    Height="{StaticResource PasswordBoxButtonHeight}"
-                                    Margin="{StaticResource PasswordBoxButtonMargin}"
-                                    Padding="{StaticResource PasswordBoxButtonPadding}"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Top"
-                                    HorizontalContentAlignment="Center"
-                                    VerticalContentAlignment="Center"
-                                    Appearance="Secondary"
-                                    Background="Transparent"
-                                    BorderBrush="Transparent"
-                                    Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    CommandParameter="clear"
-                                    Cursor="Arrow"
-                                    Foreground="{DynamicResource TextControlButtonForeground}"
-                                    IsTabStop="False">
+                                <controls:Button x:Name="ClearButton"
+                                                 Grid.Column="2"
+                                                 Width="{StaticResource PasswordBoxButtonHeight}"
+                                                 Height="{StaticResource PasswordBoxButtonHeight}"
+                                                 Margin="{StaticResource PasswordBoxButtonMargin}"
+                                                 Padding="{StaticResource PasswordBoxButtonPadding}"
+                                                 HorizontalAlignment="Center"
+                                                 VerticalAlignment="Top"
+                                                 HorizontalContentAlignment="Center"
+                                                 VerticalContentAlignment="Center"
+                                                 Appearance="Secondary"
+                                                 Background="Transparent"
+                                                 BorderBrush="Transparent"
+                                                 Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 CommandParameter="clear"
+                                                 Cursor="Arrow"
+                                                 Foreground="{DynamicResource TextControlButtonForeground}"
+                                                 IsTabStop="False"
+                                                 >
                                     <controls:Button.Icon>
-                                        <controls:SymbolIcon FontSize="{StaticResource PasswordBoxButtonIconSize}" Symbol="Dismiss24" />
+                                        <controls:SymbolIcon FontSize="{StaticResource PasswordBoxButtonIconSize}"
+                                                             Symbol="Dismiss24"
+                                                             />
                                     </controls:Button.Icon>
                                 </controls:Button>
 
-                                <controls:Button
-                                    x:Name="RevealButton"
-                                    Grid.Column="3"
-                                    Width="{StaticResource PasswordBoxButtonHeight}"
-                                    Height="{StaticResource PasswordBoxButtonHeight}"
-                                    Margin="{StaticResource PasswordBoxButtonMargin}"
-                                    Padding="{StaticResource PasswordBoxButtonPadding}"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Top"
-                                    HorizontalContentAlignment="Center"
-                                    VerticalContentAlignment="Center"
-                                    Appearance="Secondary"
-                                    Background="Transparent"
-                                    BorderBrush="Transparent"
-                                    Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    CommandParameter="reveal"
-                                    Cursor="Arrow"
-                                    Foreground="{DynamicResource TextControlButtonForeground}"
-                                    IsTabStop="False">
+                                <controls:Button x:Name="RevealButton"
+                                                 Grid.Column="3"
+                                                 Width="{StaticResource PasswordBoxButtonHeight}"
+                                                 Height="{StaticResource PasswordBoxButtonHeight}"
+                                                 Margin="{StaticResource PasswordBoxButtonMargin}"
+                                                 Padding="{StaticResource PasswordBoxButtonPadding}"
+                                                 HorizontalAlignment="Center"
+                                                 VerticalAlignment="Top"
+                                                 HorizontalContentAlignment="Center"
+                                                 VerticalContentAlignment="Center"
+                                                 Appearance="Secondary"
+                                                 Background="Transparent"
+                                                 BorderBrush="Transparent"
+                                                 Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 CommandParameter="reveal"
+                                                 Cursor="Arrow"
+                                                 Foreground="{DynamicResource TextControlButtonForeground}"
+                                                 IsTabStop="False"
+                                                 >
                                     <controls:Button.Icon>
-                                        <controls:SymbolIcon FontSize="{StaticResource PasswordBoxButtonIconSize}" Symbol="Eye24" />
+                                        <controls:SymbolIcon FontSize="{StaticResource PasswordBoxButtonIconSize}"
+                                                             Symbol="Eye24"
+                                                             />
                                     </controls:Button.Icon>
                                 </controls:Button>
 
-                                <ContentPresenter
-                                    x:Name="ControlIconRight"
-                                    Grid.Column="4"
-                                    Margin="{StaticResource PasswordBoxRightIconMargin}"
-                                    VerticalAlignment="Top"
-                                    Content="{TemplateBinding Icon}"
-                                    TextElement.FontSize="16"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                                <ContentPresenter x:Name="ControlIconRight"
+                                                  Grid.Column="4"
+                                                  Margin="{StaticResource PasswordBoxRightIconMargin}"
+                                                  VerticalAlignment="Top"
+                                                  Content="{TemplateBinding Icon}"
+                                                  TextElement.FontSize="16"
+                                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                                  />
                             </Grid>
                         </Border>
 
                         <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
-                        <Border
-                            x:Name="AccentBorder"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
-                            BorderThickness="{StaticResource PasswordBoxAccentBorderThemeThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}" />
+                        <Border x:Name="AccentBorder"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
+                                BorderThickness="{StaticResource PasswordBoxAccentBorderThemeThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="CurrentPlaceholderEnabled" Value="False">
-                            <Setter TargetName="PlaceholderTextBox" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PlaceholderTextBox" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                         <Trigger Property="ShowClearButton" Value="False">
-                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ClearButton" Property="Margin" Value="0" />
+                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ClearButton" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="ClearButtonEnabled" Value="False">
-                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ClearButton" Property="Margin" Value="0" />
+                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ClearButton" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="RevealButtonEnabled" Value="False">
-                            <Setter TargetName="RevealButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="RevealButton" Property="Margin" Value="0" />
+                            <Setter TargetName="RevealButton" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="RevealButton" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="IsPasswordRevealed" Value="True">
                             <Setter TargetName="RevealButton" Property="Icon">
                                 <Setter.Value>
-                                    <controls:SymbolIcon Symbol="EyeOff24" />
+                                    <controls:SymbolIcon Symbol="EyeOff24"/>
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
                         <Trigger Property="IconPlacement" Value="Left">
-                            <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ControlIconRight" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ControlIconRight" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="IconPlacement" Value="Right">
-                            <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ControlIconLeft" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ControlIconLeft" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ControlIconRight" Property="Margin" Value="0" />
-                            <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ControlIconLeft" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ControlIconRight" Property="Margin" Value="0"/>
+                            <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="ControlIconLeft" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlFocusedBorderBrush}" />
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
+                            <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2"/>
+                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlFocusedBorderBrush}"/>
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsFocused" Value="False" />
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsFocused" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}"/>
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="True">
-                            <Setter Property="Cursor" Value="IBeam" />
+                            <Setter Property="Cursor" Value="IBeam"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-                            <Setter TargetName="ControlIconLeft" Property="TextElement.Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                            <Setter TargetName="ControlIconRight" Property="TextElement.Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                            <Setter TargetName="PlaceholderTextBox" Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                            <Setter Property="ClearButtonEnabled" Value="False" />
-                            <Setter Property="RevealButtonEnabled" Value="False" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}"/>
+                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}"/>
+                            <Setter TargetName="ControlIconLeft" Property="TextElement.Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
+                            <Setter TargetName="ControlIconRight" Property="TextElement.Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
+                            <Setter TargetName="PlaceholderTextBox" Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
+                            <Setter Property="ClearButtonEnabled" Value="False"/>
+                            <Setter Property="RevealButtonEnabled" Value="False"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -325,7 +341,11 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultPasswordBoxStyle}" TargetType="{x:Type PasswordBox}" />
-    <Style BasedOn="{StaticResource DefaultUiPasswordBoxStyle}" TargetType="{x:Type controls:PasswordBox}" />
+    <Style BasedOn="{StaticResource DefaultPasswordBoxStyle}"
+           TargetType="{x:Type PasswordBox}"
+           />
+    <Style BasedOn="{StaticResource DefaultUiPasswordBoxStyle}"
+           TargetType="{x:Type controls:PasswordBox}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ProgressBar/ProgressBar.xaml b/src/Wpf.Ui/Controls/ProgressBar/ProgressBar.xaml
index cced092ad..c9d3a1c30 100644
--- a/src/Wpf.Ui/Controls/ProgressBar/ProgressBar.xaml
+++ b/src/Wpf.Ui/Controls/ProgressBar/ProgressBar.xaml
@@ -5,53 +5,63 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <Style TargetType="{x:Type ProgressBar}">
-        <Setter Property="Foreground" Value="{DynamicResource ProgressBarForeground}" />
-        <Setter Property="Background" Value="{DynamicResource ProgressBarBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ProgressBarBorderBrush}" />
-        <Setter Property="Height" Value="4" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource ProgressBarForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource ProgressBarBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ProgressBarBorderBrush}"/>
+        <Setter Property="Height" Value="4"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ProgressBar}">
-                    <Grid Name="TemplateRoot" SnapsToDevicePixels="True">
+                    <Grid Name="TemplateRoot"
+                          SnapsToDevicePixels="True"
+                          >
                         <Grid.Style>
                             <Style TargetType="Grid">
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}" Value="Horizontal">
+                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
+                                                 Value="Horizontal"
+                                                 >
                                         <Setter Property="LayoutTransform">
                                             <Setter.Value>
-                                                <RotateTransform Angle="0" />
+                                                <RotateTransform Angle="0"/>
                                             </Setter.Value>
                                         </Setter>
                                     </DataTrigger>
-                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}" Value="Vertical">
+                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
+                                                 Value="Vertical"
+                                                 >
                                         <Setter Property="LayoutTransform">
                                             <Setter.Value>
-                                                <RotateTransform Angle="-90" />
+                                                <RotateTransform Angle="-90"/>
                                             </Setter.Value>
                                         </Setter>
                                     </DataTrigger>
                                 </Style.Triggers>
                             </Style>
                         </Grid.Style>
-                        <Border
-                            Margin="1,1,1,1"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="1.5" />
-                        <Rectangle Name="PART_Track" Margin="1,1,1,1" />
-                        <Border
-                            Name="PART_Indicator"
-                            Margin="1,1,1,1"
-                            HorizontalAlignment="Left"
-                            Background="{TemplateBinding Foreground}"
-                            CornerRadius="2" />
+                        <Border Margin="1,1,1,1"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="1.5"
+                                />
+                        <Rectangle Name="PART_Track"
+                                   Margin="1,1,1,1"
+                                   />
+                        <Border Name="PART_Indicator"
+                                Margin="1,1,1,1"
+                                HorizontalAlignment="Left"
+                                Background="{TemplateBinding Foreground}"
+                                CornerRadius="2"
+                                />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -65,42 +75,50 @@
                                 <Grid.Style>
                                     <Style TargetType="Grid">
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}" Value="Horizontal">
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
+                                                         Value="Horizontal"
+                                                         >
                                                 <Setter Property="LayoutTransform">
                                                     <Setter.Value>
-                                                        <RotateTransform Angle="0" />
+                                                        <RotateTransform Angle="0"/>
                                                     </Setter.Value>
                                                 </Setter>
                                             </DataTrigger>
-                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}" Value="Vertical">
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
+                                                         Value="Vertical"
+                                                         >
                                                 <Setter Property="LayoutTransform">
                                                     <Setter.Value>
-                                                        <RotateTransform Angle="-90" />
+                                                        <RotateTransform Angle="-90"/>
                                                     </Setter.Value>
                                                 </Setter>
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
                                 </Grid.Style>
-                                <Border
-                                    Margin="1,1,1,1"
-                                    Background="{DynamicResource ProgressBarIndeterminateBackground}"
-                                    BorderBrush="{DynamicResource ProgressBarIndeterminateBackground}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="4" />
-                                <Rectangle Name="PART_Track" Margin="1,1,1,1" />
-                                <Decorator
-                                    Name="PART_Indicator"
-                                    Margin="1,1,1,1"
-                                    HorizontalAlignment="Left">
-                                    <Grid Name="Animation" ClipToBounds="True">
-                                        <Border
-                                            Name="PART_GlowRect"
-                                            Width="200"
-                                            Margin="0,0,0,0"
-                                            HorizontalAlignment="Left"
-                                            Background="{TemplateBinding Foreground}"
-                                            CornerRadius="2" />
+                                <Border Margin="1,1,1,1"
+                                        Background="{DynamicResource ProgressBarIndeterminateBackground}"
+                                        BorderBrush="{DynamicResource ProgressBarIndeterminateBackground}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="4"
+                                        />
+                                <Rectangle Name="PART_Track"
+                                           Margin="1,1,1,1"
+                                           />
+                                <Decorator Name="PART_Indicator"
+                                           Margin="1,1,1,1"
+                                           HorizontalAlignment="Left"
+                                           >
+                                    <Grid Name="Animation"
+                                          ClipToBounds="True"
+                                          >
+                                        <Border Name="PART_GlowRect"
+                                                Width="200"
+                                                Margin="0,0,0,0"
+                                                HorizontalAlignment="Left"
+                                                Background="{TemplateBinding Foreground}"
+                                                CornerRadius="2"
+                                                />
                                     </Grid>
                                 </Decorator>
                             </Grid>
diff --git a/src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml b/src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml
index 6dc7b15a6..f2466720c 100644
--- a/src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml
+++ b/src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml
@@ -5,37 +5,39 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+                    >
 
-    <converters:ProgressThicknessConverter x:Key="ProgressThicknessConverter" />
+    <converters:ProgressThicknessConverter x:Key="ProgressThicknessConverter"/>
 
     <Style TargetType="{x:Type controls:ProgressRing}">
-        <Setter Property="Height" Value="60" />
-        <Setter Property="Width" Value="60" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="{DynamicResource ProgressRingForegroundThemeBrush}" />
-        <Setter Property="CoverRingStroke" Value="{DynamicResource ProgressRingBackgroundThemeBrush}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Height" Value="60"/>
+        <Setter Property="Width" Value="60"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Foreground" Value="{DynamicResource ProgressRingForegroundThemeBrush}"/>
+        <Setter Property="CoverRingStroke" Value="{DynamicResource ProgressRingBackgroundThemeBrush}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:ProgressRing}">
-                    <Grid Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-                        <controls:Arc
-                            EndAngle="359"
-                            StartAngle="0"
-                            Stroke="{TemplateBinding CoverRingStroke}"
-                            StrokeThickness="{Binding Path=Height, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource ProgressThicknessConverter}}"
-                            Visibility="{TemplateBinding CoverRingVisibility}" />
-                        <controls:Arc
-                            EndAngle="{TemplateBinding EngAngle}"
-                            StartAngle="0"
-                            Stroke="{TemplateBinding Foreground}"
-                            StrokeThickness="{Binding Path=Height, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource ProgressThicknessConverter}}" />
+                    <Grid Width="{TemplateBinding Width}"
+                          Height="{TemplateBinding Height}"
+                          >
+                        <controls:Arc EndAngle="359"
+                                      StartAngle="0"
+                                      Stroke="{TemplateBinding CoverRingStroke}"
+                                      StrokeThickness="{Binding Path=Height, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource ProgressThicknessConverter}}"
+                                      Visibility="{TemplateBinding CoverRingVisibility}"
+                                      />
+                        <controls:Arc EndAngle="{TemplateBinding EngAngle}"
+                                      StartAngle="0"
+                                      Stroke="{TemplateBinding Foreground}"
+                                      StrokeThickness="{Binding Path=Height, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource ProgressThicknessConverter}}"
+                                      />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -45,22 +47,24 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type controls:ProgressRing}">
-                            <Grid Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-                                <controls:Arc
-                                    EndAngle="359"
-                                    StartAngle="0"
-                                    Stroke="{TemplateBinding CoverRingStroke}"
-                                    StrokeThickness="{Binding Path=Height, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource ProgressThicknessConverter}}"
-                                    Visibility="{TemplateBinding CoverRingVisibility}" />
-                                <controls:Arc
-                                    x:Name="Arc"
-                                    EndAngle="{TemplateBinding IndeterminateAngle}"
-                                    RenderTransformOrigin="0.5, 0.5"
-                                    StartAngle="0"
-                                    Stroke="{TemplateBinding Foreground}"
-                                    StrokeThickness="{Binding Path=Height, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource ProgressThicknessConverter}}">
+                            <Grid Width="{TemplateBinding Width}"
+                                  Height="{TemplateBinding Height}"
+                                  >
+                                <controls:Arc EndAngle="359"
+                                              StartAngle="0"
+                                              Stroke="{TemplateBinding CoverRingStroke}"
+                                              StrokeThickness="{Binding Path=Height, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource ProgressThicknessConverter}}"
+                                              Visibility="{TemplateBinding CoverRingVisibility}"
+                                              />
+                                <controls:Arc x:Name="Arc"
+                                              EndAngle="{TemplateBinding IndeterminateAngle}"
+                                              RenderTransformOrigin="0.5, 0.5"
+                                              StartAngle="0"
+                                              Stroke="{TemplateBinding Foreground}"
+                                              StrokeThickness="{Binding Path=Height, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={StaticResource ProgressThicknessConverter}}"
+                                              >
                                     <controls:Arc.RenderTransform>
-                                        <RotateTransform />
+                                        <RotateTransform/>
                                     </controls:Arc.RenderTransform>
                                 </controls:Arc>
                             </Grid>
@@ -69,27 +73,27 @@
                                     <Trigger.EnterActions>
                                         <BeginStoryboard>
                                             <Storyboard>
-                                                <DoubleAnimation
-                                                    RepeatBehavior="Forever"
-                                                    Storyboard.TargetName="Arc"
-                                                    Storyboard.TargetProperty="(Canvas.RenderTransform).(RotateTransform.Angle)"
-                                                    To="360"
-                                                    Duration="0:0:2" />
+                                                <DoubleAnimation RepeatBehavior="Forever"
+                                                                 Storyboard.TargetName="Arc"
+                                                                 Storyboard.TargetProperty="(Canvas.RenderTransform).(RotateTransform.Angle)"
+                                                                 To="360"
+                                                                 Duration="0:0:2"
+                                                                 />
 
-                                                <DoubleAnimation
-                                                    AutoReverse="True"
-                                                    RepeatBehavior="Forever"
-                                                    Storyboard.TargetName="Arc"
-                                                    Storyboard.TargetProperty="EndAngle"
-                                                    From="100"
-                                                    To="320"
-                                                    Duration="0:0:5" />
+                                                <DoubleAnimation AutoReverse="True"
+                                                                 RepeatBehavior="Forever"
+                                                                 Storyboard.TargetName="Arc"
+                                                                 Storyboard.TargetProperty="EndAngle"
+                                                                 From="100"
+                                                                 To="320"
+                                                                 Duration="0:0:5"
+                                                                 />
                                             </Storyboard>
                                         </BeginStoryboard>
                                     </Trigger.EnterActions>
                                     <Trigger.ExitActions>
                                         <BeginStoryboard>
-                                            <Storyboard />
+                                            <Storyboard/>
                                         </BeginStoryboard>
                                     </Trigger.ExitActions>
                                 </Trigger>
diff --git a/src/Wpf.Ui/Controls/RadioButton/RadioButton.xaml b/src/Wpf.Ui/Controls/RadioButton/RadioButton.xaml
index 5dec5478b..fdf9b80cd 100644
--- a/src/Wpf.Ui/Controls/RadioButton/RadioButton.xaml
+++ b/src/Wpf.Ui/Controls/RadioButton/RadioButton.xaml
@@ -8,10 +8,10 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                    >
 
     <system:Double x:Key="RadioButtonCheckGlyphSize">12</system:Double>
     <system:Double x:Key="RadioButtonOuterEllipseSize">20</system:Double>
@@ -21,90 +21,94 @@
     <system:Double x:Key="RadioButtonStrokeThickness">1</system:Double>
     <Thickness x:Key="RadioButtonPadding">8,6,0,0</Thickness>
 
-    <Style x:Key="DefaultRadioButtonStyle" TargetType="{x:Type RadioButton}">
+    <Style x:Key="DefaultRadioButtonStyle"
+           TargetType="{x:Type RadioButton}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Background" Value="{DynamicResource RadioButtonOuterEllipseCheckedStroke}" />
-        <Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="{StaticResource RadioButtonPadding}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="MinWidth" Value="120" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
-        <Setter Property="Focusable" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource RadioButtonOuterEllipseCheckedStroke}"/>
+        <Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="{StaticResource RadioButtonPadding}"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="MinWidth" Value="120"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="True"/>
+        <Setter Property="Focusable" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RadioButton}">
-                    <Grid
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="Transparent">
+                    <Grid HorizontalAlignment="Stretch"
+                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                          Background="Transparent"
+                          >
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="20" />
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="20"/>
+                            <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
-                        <Grid Height="32" VerticalAlignment="Top">
-                            <Ellipse
-                                x:Name="OuterEllipse"
-                                Width="{StaticResource RadioButtonOuterEllipseSize}"
-                                Height="{StaticResource RadioButtonOuterEllipseSize}"
-                                Fill="{DynamicResource RadioButtonOuterEllipseFill}"
-                                Stroke="{DynamicResource RadioButtonOuterEllipseStroke}"
-                                StrokeThickness="{StaticResource RadioButtonStrokeThickness}"
-                                UseLayoutRounding="False" />
+                        <Grid Height="32"
+                              VerticalAlignment="Top"
+                              >
+                            <Ellipse x:Name="OuterEllipse"
+                                     Width="{StaticResource RadioButtonOuterEllipseSize}"
+                                     Height="{StaticResource RadioButtonOuterEllipseSize}"
+                                     Fill="{DynamicResource RadioButtonOuterEllipseFill}"
+                                     Stroke="{DynamicResource RadioButtonOuterEllipseStroke}"
+                                     StrokeThickness="{StaticResource RadioButtonStrokeThickness}"
+                                     UseLayoutRounding="False"
+                                     />
                             <!--  A seperate element is added since the two orthogonal state groups that cannot touch the same property  -->
-                            <Ellipse
-                                x:Name="CheckOuterEllipse"
-                                Width="{StaticResource RadioButtonOuterEllipseSize}"
-                                Height="{StaticResource RadioButtonOuterEllipseSize}"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="0"
-                                Stroke="{TemplateBinding Background}"
-                                StrokeThickness="{StaticResource RadioButtonStrokeThickness}"
-                                UseLayoutRounding="False" />
-                            <Ellipse
-                                x:Name="CheckGlyph"
-                                Width="{StaticResource RadioButtonCheckGlyphSize}"
-                                Height="{StaticResource RadioButtonCheckGlyphSize}"
-                                Fill="{DynamicResource RadioButtonCheckGlyphFill}"
-                                Opacity="0"
-                                Stroke="{DynamicResource CircleElevationBorderBrush}"
-                                UseLayoutRounding="False">
+                            <Ellipse x:Name="CheckOuterEllipse"
+                                     Width="{StaticResource RadioButtonOuterEllipseSize}"
+                                     Height="{StaticResource RadioButtonOuterEllipseSize}"
+                                     Fill="{TemplateBinding Background}"
+                                     Opacity="0"
+                                     Stroke="{TemplateBinding Background}"
+                                     StrokeThickness="{StaticResource RadioButtonStrokeThickness}"
+                                     UseLayoutRounding="False"
+                                     />
+                            <Ellipse x:Name="CheckGlyph"
+                                     Width="{StaticResource RadioButtonCheckGlyphSize}"
+                                     Height="{StaticResource RadioButtonCheckGlyphSize}"
+                                     Fill="{DynamicResource RadioButtonCheckGlyphFill}"
+                                     Opacity="0"
+                                     Stroke="{DynamicResource CircleElevationBorderBrush}"
+                                     UseLayoutRounding="False"
+                                     >
                                 <Ellipse.LayoutTransform>
-                                    <ScaleTransform ScaleX="1.0" ScaleY="1.0" />
+                                    <ScaleTransform ScaleX="1.0" ScaleY="1.0"/>
                                 </Ellipse.LayoutTransform>
                             </Ellipse>
                             <!--  A seperate element is added since the two orthogonal state groups that cannot touch the same property  -->
-                            <Border
-                                x:Name="PressedCheckGlyph"
-                                Width="4"
-                                Height="4"
-                                Background="{DynamicResource RadioButtonCheckGlyphFill}"
-                                BorderBrush="{DynamicResource CircleElevationBorderBrush}"
-                                CornerRadius="6"
-                                Opacity="0"
-                                UseLayoutRounding="False" />
+                            <Border x:Name="PressedCheckGlyph"
+                                    Width="4"
+                                    Height="4"
+                                    Background="{DynamicResource RadioButtonCheckGlyphFill}"
+                                    BorderBrush="{DynamicResource CircleElevationBorderBrush}"
+                                    CornerRadius="6"
+                                    Opacity="0"
+                                    UseLayoutRounding="False"
+                                    />
 
                         </Grid>
-                        <ContentPresenter
-                            x:Name="ContentPresenter"
-                            Grid.Column="1"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          Grid.Column="1"
+                                          Margin="{TemplateBinding Padding}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          TextElement.Foreground="{TemplateBinding Foreground}"
+                                          />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <!-- Clunky, todo
@@ -154,63 +158,63 @@
                         -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsPressed" Value="True" />
-                                <Condition Property="IsChecked" Value="False" />
-                                <Condition Property="IsEnabled" Value="True" />
+                                <Condition Property="IsPressed" Value="True"/>
+                                <Condition Property="IsChecked" Value="False"/>
+                                <Condition Property="IsEnabled" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1.0" />
-                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPressed}" />
-                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePressed}" />
+                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1.0"/>
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPressed}"/>
+                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePressed}"/>
                         </MultiTrigger>
 
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1.0" />
-                            <Setter TargetName="OuterEllipse" Property="Opacity" Value="0.0" />
-                            <Setter TargetName="CheckOuterEllipse" Property="Opacity" Value="1.0" />
+                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1.0"/>
+                            <Setter TargetName="OuterEllipse" Property="Opacity" Value="0.0"/>
+                            <Setter TargetName="CheckOuterEllipse" Property="Opacity" Value="1.0"/>
                         </Trigger>
                         <Trigger Property="FlowDirection" Value="RightToLeft">
-                            <Setter Property="HorizontalAlignment" Value="Right" />
+                            <Setter Property="HorizontalAlignment" Value="Right"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsChecked" Value="False" />
-                                <Condition Property="IsEnabled" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="False"/>
+                                <Condition Property="IsEnabled" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPointerOver}" />
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPointerOver}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsChecked" Value="True" />
-                                <Condition Property="IsEnabled" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="True"/>
+                                <Condition Property="IsEnabled" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPointerOver}" />
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPointerOver}"/>
                             <!--<Setter TargetName="CheckGlyph" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />-->
-                            <Setter TargetName="PressedCheckGlyph" Property="Background" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />
+                            <Setter TargetName="PressedCheckGlyph" Property="Background" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsChecked" Value="False" />
-                                <Condition Property="IsEnabled" Value="False" />
+                                <Condition Property="IsChecked" Value="False"/>
+                                <Condition Property="IsEnabled" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundDisabled}" />
-                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillDisabled}" />
-                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokeDisabled}" />
+                            <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundDisabled}"/>
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillDisabled}"/>
+                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokeDisabled}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsChecked" Value="True" />
-                                <Condition Property="IsEnabled" Value="False" />
+                                <Condition Property="IsChecked" Value="True"/>
+                                <Condition Property="IsEnabled" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundDisabled}" />
-                            <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundDisabled}" />
-                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillDisabled}" />
-                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokeDisabled}" />
+                            <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundDisabled}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundDisabled}"/>
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillDisabled}"/>
+                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokeDisabled}"/>
 
 
-                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="0.7" />
-                            <Setter TargetName="CheckOuterEllipse" Property="Opacity" Value="0.7" />
+                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="0.7"/>
+                            <Setter TargetName="CheckOuterEllipse" Property="Opacity" Value="0.7"/>
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -218,6 +222,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultRadioButtonStyle}" TargetType="{x:Type RadioButton}" />
+    <Style BasedOn="{StaticResource DefaultRadioButtonStyle}"
+           TargetType="{x:Type RadioButton}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/RatingControl/RatingControl.xaml b/src/Wpf.Ui/Controls/RatingControl/RatingControl.xaml
index 794011914..84553d33a 100644
--- a/src/Wpf.Ui/Controls/RatingControl/RatingControl.xaml
+++ b/src/Wpf.Ui/Controls/RatingControl/RatingControl.xaml
@@ -5,94 +5,96 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Style TargetType="{x:Type controls:RatingControl}">
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Foreground" Value="{DynamicResource RatingControlSelectedForeground}" />
+        <Setter Property="Foreground" Value="{DynamicResource RatingControlSelectedForeground}"/>
 
-        <Setter Property="FontSize" Value="20" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:RatingControl}">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
 
-                        <Grid
-                            x:Name="StarsContainer"
-                            Grid.Column="0"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                        <Grid x:Name="StarsContainer"
+                              Grid.Column="0"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              >
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
 
-                            <controls:SymbolIcon
-                                x:Name="PART_Star1"
-                                Grid.Column="0"
-                                FontSize="{TemplateBinding FontSize}"
-                                Foreground="{TemplateBinding Foreground}"
-                                Symbol="Star28" />
-                            <controls:SymbolIcon
-                                x:Name="PART_Star2"
-                                Grid.Column="1"
-                                FontSize="{TemplateBinding FontSize}"
-                                Foreground="{TemplateBinding Foreground}"
-                                Symbol="Star28" />
-                            <controls:SymbolIcon
-                                x:Name="PART_Star3"
-                                Grid.Column="2"
-                                FontSize="{TemplateBinding FontSize}"
-                                Foreground="{TemplateBinding Foreground}"
-                                Symbol="Star28" />
-                            <controls:SymbolIcon
-                                x:Name="PART_Star4"
-                                Grid.Column="3"
-                                FontSize="{TemplateBinding FontSize}"
-                                Foreground="{TemplateBinding Foreground}"
-                                Symbol="Star28" />
-                            <controls:SymbolIcon
-                                x:Name="PART_Star5"
-                                Grid.Column="4"
-                                FontSize="{TemplateBinding FontSize}"
-                                Foreground="{TemplateBinding Foreground}"
-                                Symbol="Star28" />
+                            <controls:SymbolIcon x:Name="PART_Star1"
+                                                 Grid.Column="0"
+                                                 FontSize="{TemplateBinding FontSize}"
+                                                 Foreground="{TemplateBinding Foreground}"
+                                                 Symbol="Star28"
+                                                 />
+                            <controls:SymbolIcon x:Name="PART_Star2"
+                                                 Grid.Column="1"
+                                                 FontSize="{TemplateBinding FontSize}"
+                                                 Foreground="{TemplateBinding Foreground}"
+                                                 Symbol="Star28"
+                                                 />
+                            <controls:SymbolIcon x:Name="PART_Star3"
+                                                 Grid.Column="2"
+                                                 FontSize="{TemplateBinding FontSize}"
+                                                 Foreground="{TemplateBinding Foreground}"
+                                                 Symbol="Star28"
+                                                 />
+                            <controls:SymbolIcon x:Name="PART_Star4"
+                                                 Grid.Column="3"
+                                                 FontSize="{TemplateBinding FontSize}"
+                                                 Foreground="{TemplateBinding Foreground}"
+                                                 Symbol="Star28"
+                                                 />
+                            <controls:SymbolIcon x:Name="PART_Star5"
+                                                 Grid.Column="4"
+                                                 FontSize="{TemplateBinding FontSize}"
+                                                 Foreground="{TemplateBinding Foreground}"
+                                                 Symbol="Star28"
+                                                 />
                         </Grid>
 
-                        <Grid
-                            x:Name="ContentGrid"
-                            Grid.Column="1"
-                            Margin="8,0,0,0"
-                            VerticalAlignment="Center">
-                            <ContentPresenter TextElement.FontSize="13" TextElement.Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+                        <Grid x:Name="ContentGrid"
+                              Grid.Column="1"
+                              Margin="8,0,0,0"
+                              VerticalAlignment="Center"
+                              >
+                            <ContentPresenter TextElement.FontSize="13"
+                                              TextElement.Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                              />
                         </Grid>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Content" Value="{x:Null}">
-                            <Setter TargetName="ContentGrid" Property="Margin" Value="0" />
+                            <Setter TargetName="ContentGrid" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="StarsContainer" Property="Opacity" Value="0.5" />
+                            <Setter TargetName="StarsContainer" Property="Opacity" Value="0.5"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/RichTextBox/RichTextBox.xaml b/src/Wpf.Ui/Controls/RichTextBox/RichTextBox.xaml
index d1a472441..9f3218ecd 100644
--- a/src/Wpf.Ui/Controls/RichTextBox/RichTextBox.xaml
+++ b/src/Wpf.Ui/Controls/RichTextBox/RichTextBox.xaml
@@ -5,57 +5,59 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style x:Key="DefaultRichTextBoxStyle" TargetType="{x:Type RichTextBox}">
-        <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-        <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />
-        <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="MinHeight" Value="34" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Padding" Value="6,4" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultRichTextBoxStyle"
+           TargetType="{x:Type RichTextBox}"
+           >
+        <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}"/>
+        <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource TextControlBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="MinHeight" Value="34"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RichTextBox}">
-                    <Border
-                        x:Name="MainBorder"
-                        Padding="0"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="4"
-                        Focusable="False">
-                        <controls:PassiveScrollViewer
-                            x:Name="PART_ContentHost"
-                            Margin="0,0,2,0"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Foreground="{TemplateBinding Foreground}"
-                            HorizontalScrollBarVisibility="{TemplateBinding HorizontalScrollBarVisibility}"
-                            VerticalScrollBarVisibility="{TemplateBinding VerticalScrollBarVisibility}" />
+                    <Border x:Name="MainBorder"
+                            Padding="0"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="4"
+                            Focusable="False"
+                            >
+                        <controls:PassiveScrollViewer x:Name="PART_ContentHost"
+                                                      Margin="0,0,2,0"
+                                                      Padding="{TemplateBinding Padding}"
+                                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                      Foreground="{TemplateBinding Foreground}"
+                                                      HorizontalScrollBarVisibility="{TemplateBinding HorizontalScrollBarVisibility}"
+                                                      VerticalScrollBarVisibility="{TemplateBinding VerticalScrollBarVisibility}"
+                                                      />
                     </Border>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsFocused" Value="False" />
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsFocused" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
+                            <Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}"/>
                         </MultiTrigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
+                            <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -63,24 +65,28 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultRichTextBoxStyle}" TargetType="{x:Type RichTextBox}" />
+    <Style BasedOn="{StaticResource DefaultRichTextBoxStyle}"
+           TargetType="{x:Type RichTextBox}"
+           />
 
-    <Style
-        x:Key="DefaultUiRichTextBoxStyle"
-        BasedOn="{StaticResource DefaultRichTextBoxStyle}"
-        TargetType="{x:Type controls:RichTextBox}">
+    <Style x:Key="DefaultUiRichTextBoxStyle"
+           BasedOn="{StaticResource DefaultRichTextBoxStyle}"
+           TargetType="{x:Type controls:RichTextBox}"
+           >
 
         <Style.Triggers>
             <Trigger Property="IsTextSelectionEnabled" Value="True">
-                <Setter Property="IsReadOnly" Value="True" />
-                <Setter Property="Background" Value="Transparent" />
-                <Setter Property="Padding" Value="0" />
-                <Setter Property="BorderBrush" Value="Transparent" />
-                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="IsReadOnly" Value="True"/>
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="Padding" Value="0"/>
+                <Setter Property="BorderBrush" Value="Transparent"/>
+                <Setter Property="BorderThickness" Value="0"/>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiRichTextBoxStyle}" TargetType="{x:Type controls:RichTextBox}" />
+    <Style BasedOn="{StaticResource DefaultUiRichTextBoxStyle}"
+           TargetType="{x:Type controls:RichTextBox}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ScrollBar/ScrollBar.xaml b/src/Wpf.Ui/Controls/ScrollBar/ScrollBar.xaml
index 09c1aec83..3f2129b6b 100644
--- a/src/Wpf.Ui/Controls/ScrollBar/ScrollBar.xaml
+++ b/src/Wpf.Ui/Controls/ScrollBar/ScrollBar.xaml
@@ -5,11 +5,11 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    >
 
     <Duration x:Key="ScrollAnimationDuration">0:0:0.16</Duration>
     <Duration x:Key="ButtonHoverAnimationDuration">0:0:0.16</Duration>
@@ -17,57 +17,59 @@
     <sys:Double x:Key="LineButtonHeight">12</sys:Double>
     <sys:Double x:Key="LineButtonWidth">12</sys:Double>
 
-    <Style x:Key="UiScrollBarLineButton" TargetType="{x:Type RepeatButton}">
-        <Setter Property="Foreground" Value="{DynamicResource ScrollBarButtonArrowForeground}" />
-        <Setter Property="Width" Value="{StaticResource LineButtonWidth}" />
-        <Setter Property="Height" Value="{StaticResource LineButtonHeight}" />
-        <Setter Property="FontSize" Value="11" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Focusable" Value="False" />
+    <Style x:Key="UiScrollBarLineButton"
+           TargetType="{x:Type RepeatButton}"
+           >
+        <Setter Property="Foreground" Value="{DynamicResource ScrollBarButtonArrowForeground}"/>
+        <Setter Property="Width" Value="{StaticResource LineButtonWidth}"/>
+        <Setter Property="Height" Value="{StaticResource LineButtonHeight}"/>
+        <Setter Property="FontSize" Value="11"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Border
-                        x:Name="Border"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        Margin="{TemplateBinding Margin}"
-                        Background="{DynamicResource ScrollBarButtonBackground}"
-                        CornerRadius="6">
-                        <controls:SymbolIcon
-                            Margin="0,0,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Filled="True"
-                            FontSize="{TemplateBinding FontSize}"
-                            Foreground="{TemplateBinding Foreground}"
-                            Symbol="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                    <Border x:Name="Border"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            Margin="{TemplateBinding Margin}"
+                            Background="{DynamicResource ScrollBarButtonBackground}"
+                            CornerRadius="6"
+                            >
+                        <controls:SymbolIcon Margin="0,0,0,0"
+                                             HorizontalAlignment="Center"
+                                             VerticalAlignment="Center"
+                                             Filled="True"
+                                             FontSize="{TemplateBinding FontSize}"
+                                             Foreground="{TemplateBinding Foreground}"
+                                             Symbol="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                             />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="Border"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="0.0"
-                                            To="1.0"
-                                            Duration="{StaticResource ButtonHoverAnimationDuration}" />
+                                        <DoubleAnimation Storyboard.TargetName="Border"
+                                                         Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
+                                                         From="0.0"
+                                                         To="1.0"
+                                                         Duration="{StaticResource ButtonHoverAnimationDuration}"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="Border"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="1.0"
-                                            To="0.0"
-                                            Duration="{StaticResource ButtonHoverAnimationDuration}" />
+                                        <DoubleAnimation Storyboard.TargetName="Border"
+                                                         Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
+                                                         From="1.0"
+                                                         To="0.0"
+                                                         Duration="{StaticResource ButtonHoverAnimationDuration}"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
@@ -78,152 +80,162 @@
         </Setter>
     </Style>
 
-    <Style x:Key="UiScrollBarPageButton" TargetType="{x:Type RepeatButton}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Focusable" Value="False" />
+    <Style x:Key="UiScrollBarPageButton"
+           TargetType="{x:Type RepeatButton}"
+           >
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Border Background="Transparent" />
+                    <Border Background="Transparent"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="UiScrollBarThumb" TargetType="{x:Type Thumb}">
-        <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFill}" />
-        <Setter Property="Border.CornerRadius" Value="4" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Focusable" Value="False" />
+    <Style x:Key="UiScrollBarThumb"
+           TargetType="{x:Type Thumb}"
+           >
+        <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFill}"/>
+        <Setter Property="Border.CornerRadius" Value="4"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="1"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}" />
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                            />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="UiVerticalScrollBar" TargetType="{x:Type ScrollBar}">
+    <ControlTemplate x:Key="UiVerticalScrollBar"
+                     TargetType="{x:Type ScrollBar}"
+                     >
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition MaxHeight="14" />
-                <RowDefinition Height="0.00001*" />
-                <RowDefinition MaxHeight="14" />
+                <RowDefinition MaxHeight="14"/>
+                <RowDefinition Height="0.00001*"/>
+                <RowDefinition MaxHeight="14"/>
             </Grid.RowDefinitions>
-            <Border
-                x:Name="PART_Border"
-                Grid.RowSpan="3"
-                Width="12"
-                HorizontalAlignment="Center"
-                Background="{DynamicResource ScrollBarTrackFillPointerOver}"
-                CornerRadius="6"
-                Opacity="0" />
-            <RepeatButton
-                x:Name="PART_ButtonScrollUp"
-                Grid.Row="0"
-                HorizontalContentAlignment="Left"
-                Command="ScrollBar.LineUpCommand"
-                Content="{x:Static controls:SymbolRegular.CaretUp24}"
-                Opacity="0"
-                Style="{StaticResource UiScrollBarLineButton}" />
-            <Track
-                x:Name="PART_Track"
-                Grid.Row="1"
-                Width="6"
-                IsDirectionReversed="True">
+            <Border x:Name="PART_Border"
+                    Grid.RowSpan="3"
+                    Width="12"
+                    HorizontalAlignment="Center"
+                    Background="{DynamicResource ScrollBarTrackFillPointerOver}"
+                    CornerRadius="6"
+                    Opacity="0"
+                    />
+            <RepeatButton x:Name="PART_ButtonScrollUp"
+                          Grid.Row="0"
+                          HorizontalContentAlignment="Left"
+                          Command="ScrollBar.LineUpCommand"
+                          Content="{x:Static controls:SymbolRegular.CaretUp24}"
+                          Opacity="0"
+                          Style="{StaticResource UiScrollBarLineButton}"
+                          />
+            <Track x:Name="PART_Track"
+                   Grid.Row="1"
+                   Width="6"
+                   IsDirectionReversed="True"
+                   >
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageUpCommand" Style="{StaticResource UiScrollBarPageButton}" />
+                    <RepeatButton Command="ScrollBar.PageUpCommand"
+                                  Style="{StaticResource UiScrollBarPageButton}"
+                                  />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
                     <!--
                         TODO: Need to add a custom Thumb with a corner radius that will increase when OnMouseOver is triggered.
                     -->
-                    <Thumb
-                        Margin="0"
-                        Padding="0"
-                        Style="{StaticResource UiScrollBarThumb}" />
+                    <Thumb Margin="0"
+                           Padding="0"
+                           Style="{StaticResource UiScrollBarThumb}"
+                           />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageDownCommand" Style="{StaticResource UiScrollBarPageButton}" />
+                    <RepeatButton Command="ScrollBar.PageDownCommand"
+                                  Style="{StaticResource UiScrollBarPageButton}"
+                                  />
                 </Track.IncreaseRepeatButton>
             </Track>
-            <RepeatButton
-                x:Name="PART_ButtonScrollDown"
-                Grid.Row="2"
-                HorizontalContentAlignment="Left"
-                Command="ScrollBar.LineDownCommand"
-                Content="{x:Static controls:SymbolRegular.CaretDown24}"
-                Opacity="0"
-                Style="{StaticResource UiScrollBarLineButton}" />
+            <RepeatButton x:Name="PART_ButtonScrollDown"
+                          Grid.Row="2"
+                          HorizontalContentAlignment="Left"
+                          Command="ScrollBar.LineDownCommand"
+                          Content="{x:Static controls:SymbolRegular.CaretDown24}"
+                          Opacity="0"
+                          Style="{StaticResource UiScrollBarLineButton}"
+                          />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Track"
-                                Storyboard.TargetProperty="Width"
-                                From="6"
-                                To="8"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Border"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollUp"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollDown"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Track"
+                                             Storyboard.TargetProperty="Width"
+                                             From="6"
+                                             To="8"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_Border"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollUp"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollDown"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Track"
-                                Storyboard.TargetProperty="Width"
-                                From="8"
-                                To="6"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Border"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollUp"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollDown"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Track"
+                                             Storyboard.TargetProperty="Width"
+                                             From="8"
+                                             To="6"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_Border"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollUp"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollDown"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.ExitActions>
@@ -231,117 +243,123 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="UiHorizontalScrollBar" TargetType="{x:Type ScrollBar}">
+    <ControlTemplate x:Key="UiHorizontalScrollBar"
+                     TargetType="{x:Type ScrollBar}"
+                     >
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition MaxWidth="18" />
-                <ColumnDefinition Width="0.00001*" />
-                <ColumnDefinition MaxWidth="18" />
+                <ColumnDefinition MaxWidth="18"/>
+                <ColumnDefinition Width="0.00001*"/>
+                <ColumnDefinition MaxWidth="18"/>
             </Grid.ColumnDefinitions>
-            <Border
-                x:Name="PART_Border"
-                Grid.ColumnSpan="3"
-                Height="12"
-                VerticalAlignment="Center"
-                Background="{DynamicResource ScrollBarButtonBackground}"
-                CornerRadius="6"
-                Opacity="0" />
+            <Border x:Name="PART_Border"
+                    Grid.ColumnSpan="3"
+                    Height="12"
+                    VerticalAlignment="Center"
+                    Background="{DynamicResource ScrollBarButtonBackground}"
+                    CornerRadius="6"
+                    Opacity="0"
+                    />
 
-            <RepeatButton
-                x:Name="PART_ButtonScrollLeft"
-                Grid.Column="0"
-                VerticalAlignment="Center"
-                Command="ScrollBar.LineLeftCommand"
-                Content="{x:Static controls:SymbolRegular.CaretLeft24}"
-                Opacity="0"
-                Style="{StaticResource UiScrollBarLineButton}" />
-            <Track
-                x:Name="PART_Track"
-                Grid.Column="1"
-                Height="6"
-                VerticalAlignment="Center"
-                IsDirectionReversed="False">
+            <RepeatButton x:Name="PART_ButtonScrollLeft"
+                          Grid.Column="0"
+                          VerticalAlignment="Center"
+                          Command="ScrollBar.LineLeftCommand"
+                          Content="{x:Static controls:SymbolRegular.CaretLeft24}"
+                          Opacity="0"
+                          Style="{StaticResource UiScrollBarLineButton}"
+                          />
+            <Track x:Name="PART_Track"
+                   Grid.Column="1"
+                   Height="6"
+                   VerticalAlignment="Center"
+                   IsDirectionReversed="False"
+                   >
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageLeftCommand" Style="{StaticResource UiScrollBarPageButton}" />
+                    <RepeatButton Command="ScrollBar.PageLeftCommand"
+                                  Style="{StaticResource UiScrollBarPageButton}"
+                                  />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Thumb
-                        Margin="0"
-                        Padding="0"
-                        Style="{StaticResource UiScrollBarThumb}" />
+                    <Thumb Margin="0"
+                           Padding="0"
+                           Style="{StaticResource UiScrollBarThumb}"
+                           />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageRightCommand" Style="{StaticResource UiScrollBarPageButton}" />
+                    <RepeatButton Command="ScrollBar.PageRightCommand"
+                                  Style="{StaticResource UiScrollBarPageButton}"
+                                  />
                 </Track.IncreaseRepeatButton>
             </Track>
-            <RepeatButton
-                x:Name="PART_ButtonScrollRight"
-                Grid.Column="2"
-                VerticalAlignment="Center"
-                Command="ScrollBar.LineRightCommand"
-                Content="{x:Static controls:SymbolRegular.CaretRight24}"
-                Opacity="0"
-                Style="{StaticResource UiScrollBarLineButton}" />
+            <RepeatButton x:Name="PART_ButtonScrollRight"
+                          Grid.Column="2"
+                          VerticalAlignment="Center"
+                          Command="ScrollBar.LineRightCommand"
+                          Content="{x:Static controls:SymbolRegular.CaretRight24}"
+                          Opacity="0"
+                          Style="{StaticResource UiScrollBarLineButton}"
+                          />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Trigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Track"
-                                Storyboard.TargetProperty="Height"
-                                From="6"
-                                To="8"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Border"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollLeft"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollRight"
-                                Storyboard.TargetProperty="Opacity"
-                                From="0.0"
-                                To="1.0"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Track"
+                                             Storyboard.TargetProperty="Height"
+                                             From="6"
+                                             To="8"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_Border"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollLeft"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollRight"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="0.0"
+                                             To="1.0"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.EnterActions>
                 <Trigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard>
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Track"
-                                Storyboard.TargetProperty="Height"
-                                From="8"
-                                To="6"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_Border"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollLeft"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
-                            <DoubleAnimation
-                                Storyboard.TargetName="PART_ButtonScrollRight"
-                                Storyboard.TargetProperty="Opacity"
-                                From="1.0"
-                                To="0.0"
-                                Duration="{StaticResource ScrollAnimationDuration}" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Track"
+                                             Storyboard.TargetProperty="Height"
+                                             From="8"
+                                             To="6"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_Border"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollLeft"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonScrollRight"
+                                             Storyboard.TargetProperty="Opacity"
+                                             From="1.0"
+                                             To="0.0"
+                                             Duration="{StaticResource ScrollAnimationDuration}"
+                                             />
                         </Storyboard>
                     </BeginStoryboard>
                 </Trigger.ExitActions>
@@ -349,26 +367,30 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="UiScrollBar" TargetType="{x:Type ScrollBar}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="UiScrollBar"
+           TargetType="{x:Type ScrollBar}"
+           >
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Horizontal">
-                <Setter Property="Width" Value="Auto" />
-                <Setter Property="Height" Value="14" />
-                <Setter Property="Template" Value="{StaticResource UiHorizontalScrollBar}" />
+                <Setter Property="Width" Value="Auto"/>
+                <Setter Property="Height" Value="14"/>
+                <Setter Property="Template" Value="{StaticResource UiHorizontalScrollBar}"/>
             </Trigger>
             <Trigger Property="Orientation" Value="Vertical">
-                <Setter Property="Width" Value="14" />
-                <Setter Property="Height" Value="Auto" />
-                <Setter Property="Template" Value="{StaticResource UiVerticalScrollBar}" />
+                <Setter Property="Width" Value="14"/>
+                <Setter Property="Height" Value="Auto"/>
+                <Setter Property="Template" Value="{StaticResource UiVerticalScrollBar}"/>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource UiScrollBar}" TargetType="{x:Type ScrollBar}" />
+    <Style BasedOn="{StaticResource UiScrollBar}"
+           TargetType="{x:Type ScrollBar}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ScrollViewer/ScrollViewer.xaml b/src/Wpf.Ui/Controls/ScrollViewer/ScrollViewer.xaml
index 8fad518c3..be128de29 100644
--- a/src/Wpf.Ui/Controls/ScrollViewer/ScrollViewer.xaml
+++ b/src/Wpf.Ui/Controls/ScrollViewer/ScrollViewer.xaml
@@ -5,27 +5,29 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style x:Key="UiScrollViewer" TargetType="{x:Type ScrollViewer}">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="UiScrollViewer"
+           TargetType="{x:Type ScrollViewer}"
+           >
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ScrollViewer}">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
 
                         <!--
@@ -35,39 +37,43 @@
                             Grid.Column="0"
                             Grid.ColumnSpan="2">
                         -->
-                        <Grid
-                            Grid.Row="0"
-                            Grid.RowSpan="2"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Margin="{TemplateBinding Padding}">
-                            <ScrollContentPresenter CanContentScroll="{TemplateBinding CanContentScroll}" />
+                        <Grid Grid.Row="0"
+                              Grid.RowSpan="2"
+                              Grid.Column="0"
+                              Grid.ColumnSpan="2"
+                              Margin="{TemplateBinding Padding}"
+                              >
+                            <ScrollContentPresenter CanContentScroll="{TemplateBinding CanContentScroll}"/>
                         </Grid>
 
-                        <ScrollBar
-                            x:Name="PART_VerticalScrollBar"
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            Maximum="{TemplateBinding ScrollableHeight}"
-                            ViewportSize="{TemplateBinding ViewportHeight}"
-                            Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
-                            Value="{TemplateBinding VerticalOffset}" />
+                        <ScrollBar x:Name="PART_VerticalScrollBar"
+                                   Grid.Row="0"
+                                   Grid.Column="1"
+                                   Maximum="{TemplateBinding ScrollableHeight}"
+                                   ViewportSize="{TemplateBinding ViewportHeight}"
+                                   Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
+                                   Value="{TemplateBinding VerticalOffset}"
+                                   />
 
-                        <ScrollBar
-                            x:Name="PART_HorizontalScrollBar"
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Maximum="{TemplateBinding ScrollableWidth}"
-                            Orientation="Horizontal"
-                            ViewportSize="{TemplateBinding ViewportWidth}"
-                            Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
-                            Value="{TemplateBinding HorizontalOffset}" />
+                        <ScrollBar x:Name="PART_HorizontalScrollBar"
+                                   Grid.Row="1"
+                                   Grid.Column="0"
+                                   Maximum="{TemplateBinding ScrollableWidth}"
+                                   Orientation="Horizontal"
+                                   ViewportSize="{TemplateBinding ViewportWidth}"
+                                   Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
+                                   Value="{TemplateBinding HorizontalOffset}"
+                                   />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource UiScrollViewer}" TargetType="{x:Type ScrollViewer}" />
-    <Style BasedOn="{StaticResource UiScrollViewer}" TargetType="{x:Type controls:PassiveScrollViewer}" />
+    <Style BasedOn="{StaticResource UiScrollViewer}"
+           TargetType="{x:Type ScrollViewer}"
+           />
+    <Style BasedOn="{StaticResource UiScrollViewer}"
+           TargetType="{x:Type controls:PassiveScrollViewer}"
+           />
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/Separator/Separator.xaml b/src/Wpf.Ui/Controls/Separator/Separator.xaml
index b8c7c5926..483d76a92 100644
--- a/src/Wpf.Ui/Controls/Separator/Separator.xaml
+++ b/src/Wpf.Ui/Controls/Separator/Separator.xaml
@@ -5,25 +5,27 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <Style TargetType="{x:Type Separator}">
-        <Setter Property="BorderBrush" Value="{DynamicResource SeparatorBorderBrush}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="BorderThickness" Value="1,1,0,0" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SeparatorBorderBrush}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="BorderThickness" Value="1,1,0,0"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Separator}">
-                    <Border
-                        Width="{TemplateBinding Width}"
-                        Margin="{TemplateBinding Margin}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}" />
+                    <Border Width="{TemplateBinding Width}"
+                            Margin="{TemplateBinding Margin}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/Wpf.Ui/Controls/Snackbar/Snackbar.xaml b/src/Wpf.Ui/Controls/Snackbar/Snackbar.xaml
index 8e0e5aaf6..4dd5760df 100644
--- a/src/Wpf.Ui/Controls/Snackbar/Snackbar.xaml
+++ b/src/Wpf.Ui/Controls/Snackbar/Snackbar.xaml
@@ -5,115 +5,121 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Style TargetType="{x:Type controls:Snackbar}">
-        <Setter Property="Foreground" Value="{DynamicResource SnackBarForeground}" />
-        <Setter Property="ContentForeground" Value="{DynamicResource SnackBarForeground}" />
-        <Setter Property="Background" Value="{DynamicResource SnackBarBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource SnackBarBorderBrush}" />
-        <Setter Property="Margin" Value="24" />
-        <Setter Property="MinHeight" Value="68" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
-        <Setter Property="VerticalAlignment" Value="Bottom" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource SnackBarForeground}"/>
+        <Setter Property="ContentForeground" Value="{DynamicResource SnackBarForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource SnackBarBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SnackBarBorderBrush}"/>
+        <Setter Property="Margin" Value="24"/>
+        <Setter Property="MinHeight" Value="68"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="False"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:Snackbar}">
-                    <Grid
-                        x:Name="CardBorderContainer"
-                        Margin="0,0,0,-200"
-                        Opacity="0">
-                        <Border
-                            x:Name="CardBorder"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            Padding="12"
-                            VerticalAlignment="Bottom"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="1"
-                            CornerRadius="4"
-                            RenderTransform="{TemplateBinding SlideTransform}"
-                            Visibility="{TemplateBinding Visibility}">
+                    <Grid x:Name="CardBorderContainer"
+                          Margin="0,0,0,-200"
+                          Opacity="0"
+                          >
+                        <Border x:Name="CardBorder"
+                                MinHeight="{TemplateBinding MinHeight}"
+                                Padding="12"
+                                VerticalAlignment="Bottom"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="4"
+                                RenderTransform="{TemplateBinding SlideTransform}"
+                                Visibility="{TemplateBinding Visibility}"
+                                >
                             <Border.Effect>
-                                <DropShadowEffect
-                                    BlurRadius="30"
-                                    Direction="0"
-                                    Opacity="0.4"
-                                    ShadowDepth="0"
-                                    Color="#202020" />
+                                <DropShadowEffect BlurRadius="30"
+                                                  Direction="0"
+                                                  Opacity="0.4"
+                                                  ShadowDepth="0"
+                                                  Color="#202020"
+                                                  />
                             </Border.Effect>
                             <Grid>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition x:Name="ChevronColumn" Width="Auto" />
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition x:Name="ChevronColumn"
+                                                      Width="Auto"
+                                                      />
                                 </Grid.ColumnDefinitions>
 
-                                <ContentPresenter
-                                    x:Name="CardIcon"
-                                    Grid.Column="0"
-                                    Margin="0,0,12,0"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Icon}"
-                                    TextElement.FontSize="28"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                                <ContentPresenter x:Name="CardIcon"
+                                                  Grid.Column="0"
+                                                  Margin="0,0,12,0"
+                                                  VerticalAlignment="Center"
+                                                  Content="{TemplateBinding Icon}"
+                                                  TextElement.FontSize="28"
+                                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                                  />
 
                                 <Grid Grid.Column="1">
                                     <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="*" />
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="*"/>
                                     </Grid.RowDefinitions>
 
-                                    <ContentPresenter
-                                        x:Name="TitleContentPresenter"
-                                        Grid.Row="0"
-                                        Margin="0"
-                                        Content="{TemplateBinding Title}"
-                                        ContentTemplate="{TemplateBinding TitleTemplate}"
-                                        TextElement.FontSize="16"
-                                        TextElement.FontWeight="SemiBold"
-                                        TextElement.Foreground="{TemplateBinding Foreground}">
+                                    <ContentPresenter x:Name="TitleContentPresenter"
+                                                      Grid.Row="0"
+                                                      Margin="0"
+                                                      Content="{TemplateBinding Title}"
+                                                      ContentTemplate="{TemplateBinding TitleTemplate}"
+                                                      TextElement.FontSize="16"
+                                                      TextElement.FontWeight="SemiBold"
+                                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                                      >
                                         <ContentPresenter.Resources>
-                                            <Style BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="{x:Type TextBlock}">
-                                                <Setter Property="TextWrapping" Value="WrapWithOverflow" />
+                                            <Style BasedOn="{StaticResource {x:Type TextBlock}}"
+                                                   TargetType="{x:Type TextBlock}"
+                                                   >
+                                                <Setter Property="TextWrapping" Value="WrapWithOverflow"/>
                                             </Style>
                                         </ContentPresenter.Resources>
                                     </ContentPresenter>
 
-                                    <ContentPresenter
-                                        Grid.Row="1"
-                                        Content="{TemplateBinding Content}"
-                                        ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                        TextElement.FontSize="14"
-                                        TextElement.FontWeight="Regular"
-                                        TextElement.Foreground="{TemplateBinding ContentForeground}">
+                                    <ContentPresenter Grid.Row="1"
+                                                      Content="{TemplateBinding Content}"
+                                                      ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                      TextElement.FontSize="14"
+                                                      TextElement.FontWeight="Regular"
+                                                      TextElement.Foreground="{TemplateBinding ContentForeground}"
+                                                      >
                                         <ContentPresenter.Resources>
-                                            <Style BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="{x:Type TextBlock}">
-                                                <Setter Property="TextWrapping" Value="WrapWithOverflow" />
+                                            <Style BasedOn="{StaticResource {x:Type TextBlock}}"
+                                                   TargetType="{x:Type TextBlock}"
+                                                   >
+                                                <Setter Property="TextWrapping" Value="WrapWithOverflow"/>
                                             </Style>
                                         </ContentPresenter.Resources>
                                     </ContentPresenter>
                                 </Grid>
 
-                                <controls:Button
-                                    x:Name="CloseButton"
-                                    Grid.Column="2"
-                                    Margin="12,0,0,0"
-                                    Padding="6"
-                                    Appearance="{TemplateBinding Appearance}"
-                                    Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Foreground="{TemplateBinding Foreground}">
+                                <controls:Button x:Name="CloseButton"
+                                                 Grid.Column="2"
+                                                 Margin="12,0,0,0"
+                                                 Padding="6"
+                                                 Appearance="{TemplateBinding Appearance}"
+                                                 Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 Foreground="{TemplateBinding Foreground}"
+                                                 >
                                     <controls:Button.Icon>
-                                        <controls:SymbolIcon Symbol="Dismiss48" />
+                                        <controls:SymbolIcon Symbol="Dismiss48"/>
                                     </controls:Button.Icon>
                                 </controls:Button>
                             </Grid>
@@ -121,50 +127,58 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="CardIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="CardIcon" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="IsCloseButtonEnabled" Value="False">
-                            <Setter TargetName="CloseButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="CloseButton" Property="Margin" Value="0" />
+                            <Setter TargetName="CloseButton" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="CloseButton" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="IsShown" Value="True">
-                            <Setter Property="Focusable" Value="True" />
-                            <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
+                            <Setter Property="Focusable" Value="True"/>
+                            <Setter Property="KeyboardNavigation.IsTabStop" Value="True"/>
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <ThicknessAnimationUsingKeyFrames
-                                            BeginTime="00:00:00"
-                                            Storyboard.TargetName="CardBorderContainer"
-                                            Storyboard.TargetProperty="Margin">
-                                            <SplineThicknessKeyFrame KeyTime="00:00:00" Value="0,0,0,-200" />
-                                            <SplineThicknessKeyFrame KeyTime="00:00:.26" Value="0,0,0,0" />
+                                        <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                                          Storyboard.TargetName="CardBorderContainer"
+                                                                          Storyboard.TargetProperty="Margin"
+                                                                          >
+                                            <SplineThicknessKeyFrame KeyTime="00:00:00"
+                                                                     Value="0,0,0,-200"
+                                                                     />
+                                            <SplineThicknessKeyFrame KeyTime="00:00:.26"
+                                                                     Value="0,0,0,0"
+                                                                     />
                                         </ThicknessAnimationUsingKeyFrames>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="CardBorderContainer"
-                                            Storyboard.TargetProperty="(Grid.Opacity)"
-                                            From="0"
-                                            To="1"
-                                            Duration="0:0:.26" />
+                                        <DoubleAnimation Storyboard.TargetName="CardBorderContainer"
+                                                         Storyboard.TargetProperty="(Grid.Opacity)"
+                                                         From="0"
+                                                         To="1"
+                                                         Duration="0:0:.26"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <ThicknessAnimationUsingKeyFrames
-                                            BeginTime="00:00:00"
-                                            Storyboard.TargetName="CardBorderContainer"
-                                            Storyboard.TargetProperty="Margin">
-                                            <SplineThicknessKeyFrame KeyTime="00:00:00" Value="0,0,0,0" />
-                                            <SplineThicknessKeyFrame KeyTime="00:00:.32" Value="0,0,0,-200" />
+                                        <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                                          Storyboard.TargetName="CardBorderContainer"
+                                                                          Storyboard.TargetProperty="Margin"
+                                                                          >
+                                            <SplineThicknessKeyFrame KeyTime="00:00:00"
+                                                                     Value="0,0,0,0"
+                                                                     />
+                                            <SplineThicknessKeyFrame KeyTime="00:00:.32"
+                                                                     Value="0,0,0,-200"
+                                                                     />
                                         </ThicknessAnimationUsingKeyFrames>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="CardBorderContainer"
-                                            Storyboard.TargetProperty="(Grid.Opacity)"
-                                            From="1"
-                                            To="0"
-                                            Duration="0:0:.32" />
+                                        <DoubleAnimation Storyboard.TargetName="CardBorderContainer"
+                                                         Storyboard.TargetProperty="(Grid.Opacity)"
+                                                         From="1"
+                                                         To="0"
+                                                         Duration="0:0:.32"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
@@ -175,124 +189,124 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="Appearance" Value="Transparent">
-                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="Background" Value="Transparent"/>
             </Trigger>
             <Trigger Property="Appearance" Value="Primary">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextOnAccentFillColorPrimary}" />
+                        <SolidColorBrush Color="{DynamicResource TextOnAccentFillColorPrimary}"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="ContentForeground">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource TextOnAccentFillColorSecondary}" />
+                        <SolidColorBrush Color="{DynamicResource TextOnAccentFillColorSecondary}"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
+                        <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
             <Trigger Property="Appearance" Value="Dark">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#FFFFFF" />
+                        <SolidColorBrush Color="#FFFFFF"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="ContentForeground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#87FFFFFF" />
+                        <SolidColorBrush Color="#87FFFFFF"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="#2e2e2e" />
+                        <SolidColorBrush Color="#2e2e2e"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
             <Trigger Property="Appearance" Value="Light">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#E4000000" />
+                        <SolidColorBrush Color="#E4000000"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="ContentForeground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#9E000000" />
+                        <SolidColorBrush Color="#9E000000"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="#F3F3F3" />
+                        <SolidColorBrush Color="#F3F3F3"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
             <Trigger Property="Appearance" Value="Info">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#FFFFFF" />
+                        <SolidColorBrush Color="#FFFFFF"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="ContentForeground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#87FFFFFF" />
+                        <SolidColorBrush Color="#87FFFFFF"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource PaletteLightBlueColor}" />
+                        <SolidColorBrush Color="{DynamicResource PaletteLightBlueColor}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
             <Trigger Property="Appearance" Value="Danger">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#FFFFFF" />
+                        <SolidColorBrush Color="#FFFFFF"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="ContentForeground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#87FFFFFF" />
+                        <SolidColorBrush Color="#87FFFFFF"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource PaletteRedColor}" />
+                        <SolidColorBrush Color="{DynamicResource PaletteRedColor}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
             <Trigger Property="Appearance" Value="Success">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#FFFFFF" />
+                        <SolidColorBrush Color="#FFFFFF"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="ContentForeground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#87FFFFFF" />
+                        <SolidColorBrush Color="#87FFFFFF"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource PaletteGreenColor}" />
+                        <SolidColorBrush Color="{DynamicResource PaletteGreenColor}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
             <Trigger Property="Appearance" Value="Caution">
                 <Setter Property="Foreground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#FFFFFF" />
+                        <SolidColorBrush Color="#FFFFFF"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="ContentForeground">
                     <Setter.Value>
-                        <SolidColorBrush Color="#87FFFFFF" />
+                        <SolidColorBrush Color="#87FFFFFF"/>
                     </Setter.Value>
                 </Setter>
                 <Setter Property="Background">
                     <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource PaletteOrangeColor}" />
+                        <SolidColorBrush Color="{DynamicResource PaletteOrangeColor}"/>
                     </Setter.Value>
                 </Setter>
             </Trigger>
diff --git a/src/Wpf.Ui/Controls/SplitButton/SplitButton.xaml b/src/Wpf.Ui/Controls/SplitButton/SplitButton.xaml
index 609d86275..f78bcc010 100644
--- a/src/Wpf.Ui/Controls/SplitButton/SplitButton.xaml
+++ b/src/Wpf.Ui/Controls/SplitButton/SplitButton.xaml
@@ -8,133 +8,139 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+                    >
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Button/Button.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Button/Button.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Thickness x:Key="ButtonChevronIconMargin">8,0,0,0</Thickness>
 
-    <converters:LeftSplitThicknessConverter x:Key="LeftSplitThicknessConverter" />
-    <converters:RightSplitThicknessConverter x:Key="RightSplitThicknessConverter" />
-    <converters:LeftSplitCornerRadiusConverter x:Key="LeftSplitCornerRadiusConverter" />
-    <converters:RightSplitCornerRadiusConverter x:Key="RightSplitCornerRadiusConverter" />
+    <converters:LeftSplitThicknessConverter x:Key="LeftSplitThicknessConverter"/>
+    <converters:RightSplitThicknessConverter x:Key="RightSplitThicknessConverter"/>
+    <converters:LeftSplitCornerRadiusConverter x:Key="LeftSplitCornerRadiusConverter"/>
+    <converters:RightSplitCornerRadiusConverter x:Key="RightSplitCornerRadiusConverter"/>
 
 
-    <Style x:Key="DefaultSplitButtonToggleButtonStyle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="DefaultSplitButtonToggleButtonStyle"
+           TargetType="{x:Type ToggleButton}"
+           >
         <!--  Focus by parent element  -->
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <!--  Focus by parent element  -->
-        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Border.CornerRadius" Value="0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Border.CornerRadius" Value="0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Border
-                        x:Name="ContentBorder"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}">
-                        <ContentPresenter
-                            x:Name="PART_ContentHost"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+                    <Border x:Name="ContentBorder"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                            >
+                        <ContentPresenter x:Name="PART_ContentHost"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style
-        x:Key="DefaultUiSplitButtonStyle"
-        BasedOn="{StaticResource DefaultUiButtonStyle}"
-        TargetType="{x:Type controls:SplitButton}">
-        <Setter Property="Popup.PopupAnimation" Value="None" />
+    <Style x:Key="DefaultUiSplitButtonStyle"
+           BasedOn="{StaticResource DefaultUiButtonStyle}"
+           TargetType="{x:Type controls:SplitButton}"
+           >
+        <Setter Property="Popup.PopupAnimation" Value="None"/>
         <!--  WPF doesn't like centering, the animation is ugly and the mouse button sometimes clicks right away.  -->
-        <Setter Property="Popup.Placement" Value="Bottom" />
-        <Setter Property="IsDropDownOpen" Value="False" />
+        <Setter Property="Popup.Placement" Value="Bottom"/>
+        <Setter Property="IsDropDownOpen" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:SplitButton}">
-                    <Border
-                        x:Name="ContentBorder"
-                        Grid.Row="0"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        MinWidth="{TemplateBinding MinWidth}"
-                        MinHeight="{TemplateBinding MinHeight}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="{TemplateBinding Background}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
+                    <Border x:Name="ContentBorder"
+                            Grid.Row="0"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            >
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
-                            <Border
-                                Grid.Column="0"
-                                Margin="0"
-                                Padding="{TemplateBinding Padding}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness,
-                                                                  Converter={StaticResource LeftSplitThicknessConverter}}"
-                                CornerRadius="{TemplateBinding CornerRadius,
-                                                               Converter={StaticResource LeftSplitCornerRadiusConverter}}">
-                                <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <Border Grid.Column="0"
+                                    Margin="0"
+                                    Padding="{TemplateBinding Padding}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness,
+                                                                      Converter={StaticResource LeftSplitThicknessConverter}}"
+                                    CornerRadius="{TemplateBinding CornerRadius,
+                                                                   Converter={StaticResource LeftSplitCornerRadiusConverter}}"
+                                    >
+                                <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      >
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="*"/>
                                     </Grid.ColumnDefinitions>
-                                    <ContentPresenter
-                                        x:Name="ControlIcon"
-                                        Grid.Column="0"
-                                        Margin="{StaticResource ButtonIconMargin}"
-                                        VerticalAlignment="Center"
-                                        Content="{TemplateBinding Icon}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                                        Focusable="False"
-                                        TextElement.FontSize="{TemplateBinding FontSize}"
-                                        TextElement.Foreground="{TemplateBinding Foreground}" />
-                                    <ContentPresenter
-                                        x:Name="ContentPresenter"
-                                        Grid.Column="1"
-                                        VerticalAlignment="Center"
-                                        Content="{TemplateBinding Content}"
-                                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                                    <ContentPresenter x:Name="ControlIcon"
+                                                      Grid.Column="0"
+                                                      Margin="{StaticResource ButtonIconMargin}"
+                                                      VerticalAlignment="Center"
+                                                      Content="{TemplateBinding Icon}"
+                                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                      Focusable="False"
+                                                      TextElement.FontSize="{TemplateBinding FontSize}"
+                                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                                      />
+                                    <ContentPresenter x:Name="ContentPresenter"
+                                                      Grid.Column="1"
+                                                      VerticalAlignment="Center"
+                                                      Content="{TemplateBinding Content}"
+                                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                                      />
                                 </Grid>
                             </Border>
-                            <Border
-                                Grid.Column="1"
-                                Margin="0"
-                                Padding="{TemplateBinding Padding}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness,
-                                                                  Converter={StaticResource RightSplitThicknessConverter}}"
-                                CornerRadius="{TemplateBinding CornerRadius,
-                                                               Converter={StaticResource RightSplitCornerRadiusConverter}}">
-                                <ToggleButton
-                                    Name="PART_ToggleButton"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch"
-                                    ClickMode="Press"
-                                    Focusable="False"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    IsChecked="{TemplateBinding IsDropDownOpen}"
-                                    Style="{StaticResource DefaultSplitButtonToggleButtonStyle}">
-                                    <controls:SymbolIcon FontSize="10" Symbol="ChevronDown24" />
+                            <Border Grid.Column="1"
+                                    Margin="0"
+                                    Padding="{TemplateBinding Padding}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness,
+                                                                      Converter={StaticResource RightSplitThicknessConverter}}"
+                                    CornerRadius="{TemplateBinding CornerRadius,
+                                                                   Converter={StaticResource RightSplitCornerRadiusConverter}}"
+                                    >
+                                <ToggleButton Name="PART_ToggleButton"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Stretch"
+                                              ClickMode="Press"
+                                              Focusable="False"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              IsChecked="{TemplateBinding IsDropDownOpen}"
+                                              Style="{StaticResource DefaultSplitButtonToggleButtonStyle}"
+                                              >
+                                    <controls:SymbolIcon FontSize="10"
+                                                         Symbol="ChevronDown24"
+                                                         />
                                 </ToggleButton>
                             </Border>
                         </Grid>
@@ -142,36 +148,36 @@
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsPressed" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsPressed" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsPressed" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsPressed" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{Binding PressedBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{Binding PressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding PressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Setter TargetName="ControlIcon" Property="TextElement.Foreground" Value="{Binding PressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{Binding PressedBackground, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{Binding PressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding PressedForeground, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="ControlIcon" Property="TextElement.Foreground" Value="{Binding PressedForeground, RelativeSource={RelativeSource TemplatedParent}}"/>
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}"/>
                         </Trigger>
                         <Trigger Property="Content" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Content" Value="">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="ControlIcon" Property="Margin" Value="0" />
-                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="ControlIcon" Property="Margin" Value="0"/>
+                            <Setter TargetName="ControlIcon" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -179,6 +185,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiSplitButtonStyle}" TargetType="{x:Type controls:SplitButton}" />
+    <Style BasedOn="{StaticResource DefaultUiSplitButtonStyle}"
+           TargetType="{x:Type controls:SplitButton}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/StatusBar/StatusBar.xaml b/src/Wpf.Ui/Controls/StatusBar/StatusBar.xaml
index b7e5eff8b..fec3e4451 100644
--- a/src/Wpf.Ui/Controls/StatusBar/StatusBar.xaml
+++ b/src/Wpf.Ui/Controls/StatusBar/StatusBar.xaml
@@ -5,24 +5,28 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
-    <Style x:Key="{x:Static StatusBar.SeparatorStyleKey}" TargetType="{x:Type Separator}">
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Margin" Value="6,0" />
-        <Setter Property="BorderThickness" Value="1,1,0,0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="{x:Static StatusBar.SeparatorStyleKey}"
+           TargetType="{x:Type Separator}"
+           >
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Margin" Value="6,0"/>
+        <Setter Property="BorderThickness" Value="1,1,0,0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Separator}">
-                    <Border
-                        Width="{TemplateBinding Width}"
-                        Margin="{TemplateBinding Margin}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}" />
+                    <Border Width="{TemplateBinding Width}"
+                            Margin="{TemplateBinding Margin}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -31,18 +35,18 @@
     <Style TargetType="{x:Type StatusBar}">
         <Setter Property="Foreground">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}"/>
             </Setter.Value>
         </Setter>
         <Setter Property="Background">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
+                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}"/>
             </Setter.Value>
         </Setter>
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Padding" Value="12" />
-        <Setter Property="Margin" Value="0" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="12"/>
+        <Setter Property="Margin" Value="0"/>
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/TabControl/TabControl.xaml b/src/Wpf.Ui/Controls/TabControl/TabControl.xaml
index 4d18232f2..845101edb 100644
--- a/src/Wpf.Ui/Controls/TabControl/TabControl.xaml
+++ b/src/Wpf.Ui/Controls/TabControl/TabControl.xaml
@@ -5,51 +5,53 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <Style TargetType="{x:Type TabControl}">
-        <Setter Property="Foreground" Value="{DynamicResource TabViewForeground}" />
-        <Setter Property="Background" Value="{DynamicResource TabViewBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TabViewBorderBrush}" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource TabViewForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource TabViewBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource TabViewBorderBrush}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
                     <Grid KeyboardNavigation.TabNavigation="Local">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
                         </Grid.RowDefinitions>
-                        <TabPanel
-                            x:Name="HeaderPanel"
-                            Grid.Row="0"
-                            Margin="0"
-                            Panel.ZIndex="1"
-                            Background="Transparent"
-                            IsItemsHost="True"
-                            KeyboardNavigation.TabIndex="1" />
-                        <Border
-                            x:Name="Border"
-                            Grid.Row="1"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="0,1,0,0"
-                            CornerRadius="0,4,4,4"
-                            KeyboardNavigation.DirectionalNavigation="Contained"
-                            KeyboardNavigation.TabIndex="2"
-                            KeyboardNavigation.TabNavigation="Local">
-                            <ContentPresenter
-                                x:Name="PART_SelectedContentHost"
-                                Margin="0"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                ContentSource="SelectedContent"
-                                TextElement.Foreground="{TemplateBinding Foreground}" />
+                        <TabPanel x:Name="HeaderPanel"
+                                  Grid.Row="0"
+                                  Margin="0"
+                                  Panel.ZIndex="1"
+                                  Background="Transparent"
+                                  IsItemsHost="True"
+                                  KeyboardNavigation.TabIndex="1"
+                                  />
+                        <Border x:Name="Border"
+                                Grid.Row="1"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="0,1,0,0"
+                                CornerRadius="0,4,4,4"
+                                KeyboardNavigation.DirectionalNavigation="Contained"
+                                KeyboardNavigation.TabIndex="2"
+                                KeyboardNavigation.TabNavigation="Local"
+                                >
+                            <ContentPresenter x:Name="PART_SelectedContentHost"
+                                              Margin="0"
+                                              HorizontalAlignment="Stretch"
+                                              VerticalAlignment="Stretch"
+                                              ContentSource="SelectedContent"
+                                              TextElement.Foreground="{TemplateBinding Foreground}"
+                                              />
                         </Border>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Disabled" />
+                                <VisualState x:Name="Disabled"/>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </Grid>
@@ -59,57 +61,57 @@
     </Style>
 
     <Style TargetType="{x:Type TabItem}">
-        <Setter Property="Background" Value="{DynamicResource TabViewItemHeaderBackground}" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
-        <Setter Property="Focusable" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource TabViewItemHeaderBackground}"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="True"/>
+        <Setter Property="Focusable" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
                     <Grid x:Name="Root">
-                        <Border
-                            x:Name="Border"
-                            MinWidth="180"
-                            MinHeight="36"
-                            Margin="0"
-                            Padding="6"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="1,1,1,0"
-                            CornerRadius="8,8,0,0">
-                            <ContentPresenter
-                                x:Name="ContentSite"
+                        <Border x:Name="Border"
+                                MinWidth="180"
+                                MinHeight="36"
                                 Margin="0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                ContentSource="Header"
-                                RecognizesAccessKey="True" />
+                                Padding="6"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="1,1,1,0"
+                                CornerRadius="8,8,0,0"
+                                >
+                            <ContentPresenter x:Name="ContentSite"
+                                              Margin="0"
+                                              HorizontalAlignment="Left"
+                                              VerticalAlignment="Center"
+                                              ContentSource="Header"
+                                              RecognizesAccessKey="True"
+                                              />
                         </Border>
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="SelectionStates">
-                                <VisualState x:Name="Unselected" />
-                                <VisualState x:Name="Selected" />
+                                <VisualState x:Name="Unselected"/>
+                                <VisualState x:Name="Selected"/>
 
                             </VisualStateGroup>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="MouseOver" />
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="MouseOver"/>
                                 <VisualState x:Name="Disabled">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="Border"
-                                            Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Opacity)"
-                                            From="0.0"
-                                            To="0.5"
-                                            Duration="0:0:.16" />
+                                        <DoubleAnimation Storyboard.TargetName="Border"
+                                                         Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Opacity)"
+                                                         From="0.0"
+                                                         To="0.5"
+                                                         Duration="0:0:.16"
+                                                         />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -117,10 +119,10 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Panel.ZIndex" Value="100" />
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource TabViewItemHeaderBackgroundSelected}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource TabViewSelectedItemBorderBrush}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TabViewItemForegroundSelected}" />
+                            <Setter Property="Panel.ZIndex" Value="100"/>
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource TabViewItemHeaderBackgroundSelected}"/>
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource TabViewSelectedItemBorderBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TabViewItemForegroundSelected}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/TextBlock/TextBlock.xaml b/src/Wpf.Ui/Controls/TextBlock/TextBlock.xaml
index b655bdf11..b1fd45af3 100644
--- a/src/Wpf.Ui/Controls/TextBlock/TextBlock.xaml
+++ b/src/Wpf.Ui/Controls/TextBlock/TextBlock.xaml
@@ -5,7 +5,9 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <Style TargetType="{x:Type TextBlock}">
 
@@ -13,13 +15,13 @@
 
         <!--  The Display option causes a large aliasing effect  -->
         <!--<Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />-->
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
index 4fc1e5940..da34b71c1 100644
--- a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
+++ b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
@@ -8,11 +8,11 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                    >
 
     <Thickness x:Key="TextBoxBorderThemeThickness">1,1,1,1</Thickness>
     <Thickness x:Key="TextBoxAccentBorderThemeThickness">0,0,0,1</Thickness>
@@ -22,94 +22,98 @@
     <Thickness x:Key="TextBoxClearButtonPadding">0,0,0,0</Thickness>
     <system:Double x:Key="TextBoxClearButtonHeight">24</system:Double>
 
-    <Style x:Key="DefaultTextBoxStyle" TargetType="{x:Type TextBox}">
+    <Style x:Key="DefaultTextBoxStyle"
+           TargetType="{x:Type TextBox}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}"/>
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-        <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />
-        <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource TextBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
-        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}"/>
+        <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource TextControlBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource TextBoxBorderThemeThickness}"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden"/>
+        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}"/>
+        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}"/>
+        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                        <Border
-                            x:Name="ContentBorder"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            Padding="0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}">
-                            <Grid
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                <controls:PassiveScrollViewer
-                                    x:Name="PART_ContentHost"
-                                    CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
-                                    HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                    IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-                                    IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
-                                    Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
-                                    TextElement.Foreground="{TemplateBinding Foreground}"
-                                    VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
+                    <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                          >
+                        <Border x:Name="ContentBorder"
+                                MinWidth="{TemplateBinding MinWidth}"
+                                MinHeight="{TemplateBinding MinHeight}"
+                                Padding="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                >
+                            <Grid Margin="{TemplateBinding Padding}"
+                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  >
+                                <controls:PassiveScrollViewer x:Name="PART_ContentHost"
+                                                              CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                                                              HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                              IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                                                              IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
+                                                              Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
+                                                              TextElement.Foreground="{TemplateBinding Foreground}"
+                                                              VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                              />
                             </Grid>
                         </Border>
                         <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
-                        <Border
-                            x:Name="AccentBorder"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
-                            BorderThickness="{StaticResource TextBoxAccentBorderThemeThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}" />
+                        <Border x:Name="AccentBorder"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
+                                BorderThickness="{StaticResource TextBoxAccentBorderThemeThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlFocusedBorderBrush}" />
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
+                            <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2"/>
+                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlFocusedBorderBrush}"/>
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsFocused" Value="False" />
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsFocused" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}"/>
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="True">
-                            <Setter Property="Cursor" Value="IBeam" />
+                            <Setter Property="Cursor" Value="IBeam"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}"/>
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}"/>
+                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -118,236 +122,258 @@
     </Style>
 
 
-    <ControlTemplate x:Key="DefaultUiTextBoxControlTemplate" TargetType="{x:Type controls:TextBox}">
-        <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-            <Border
-                x:Name="ContentBorder"
-                MinWidth="{TemplateBinding MinWidth}"
-                MinHeight="{TemplateBinding MinHeight}"
-                Padding="0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding Border.CornerRadius}">
-                <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+    <ControlTemplate x:Key="DefaultUiTextBoxControlTemplate"
+                     TargetType="{x:Type controls:TextBox}"
+                     >
+        <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+              VerticalAlignment="{TemplateBinding VerticalAlignment}"
+              >
+            <Border x:Name="ContentBorder"
+                    MinWidth="{TemplateBinding MinWidth}"
+                    MinHeight="{TemplateBinding MinHeight}"
+                    Padding="0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding Border.CornerRadius}"
+                    >
+                <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                      >
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
-                    <ContentPresenter
-                        x:Name="ControlIconLeft"
-                        Grid.Column="0"
-                        Margin="{StaticResource TextBoxLeftIconMargin}"
-                        VerticalAlignment="Center"
-                        Content="{TemplateBinding Icon}"
-                        Focusable="False"
-                        TextElement.FontSize="{TemplateBinding FontSize}"
-                        TextElement.Foreground="{TemplateBinding Foreground}"
-                        Visibility="Visible" />
+                    <ContentPresenter x:Name="ControlIconLeft"
+                                      Grid.Column="0"
+                                      Margin="{StaticResource TextBoxLeftIconMargin}"
+                                      VerticalAlignment="Center"
+                                      Content="{TemplateBinding Icon}"
+                                      Focusable="False"
+                                      TextElement.FontSize="{TemplateBinding FontSize}"
+                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                      Visibility="Visible"
+                                      />
 
-                    <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
-                        <controls:PassiveScrollViewer
-                            x:Name="PART_ContentHost"
-                            CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
-                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                            IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-                            IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
-                            Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
-                            TextElement.Foreground="{TemplateBinding Foreground}"
-                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
-                        <TextBlock
-                            x:Name="PlaceholderTextBox"
-                            Margin="0"
-                            Padding="1,0"
-                            VerticalAlignment="Center"
-                            FontSize="{TemplateBinding FontSize}"
-                            Foreground="{DynamicResource TextControlPlaceholderForeground}"
-                            Text="{TemplateBinding PlaceholderText}" />
+                    <Grid Grid.Column="1"
+                          Margin="{TemplateBinding Padding}"
+                          >
+                        <controls:PassiveScrollViewer x:Name="PART_ContentHost"
+                                                      CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                      IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                                                      IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
+                                                      Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
+                                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                      />
+                        <TextBlock x:Name="PlaceholderTextBox"
+                                   Margin="0"
+                                   Padding="1,0"
+                                   VerticalAlignment="Center"
+                                   FontSize="{TemplateBinding FontSize}"
+                                   Foreground="{DynamicResource TextControlPlaceholderForeground}"
+                                   Text="{TemplateBinding PlaceholderText}"
+                                   />
                     </Grid>
 
                     <!--  Buttons and Icons have no padding from the main element to allow absolute positions if height is larger than the text entry zone  -->
-                    <controls:Button
-                        x:Name="ClearButton"
-                        Grid.Column="2"
-                        MinWidth="{StaticResource TextBoxClearButtonHeight}"
-                        MinHeight="{StaticResource TextBoxClearButtonHeight}"
-                        Margin="{StaticResource TextBoxClearButtonMargin}"
-                        Padding="{StaticResource TextBoxClearButtonPadding}"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        HorizontalContentAlignment="Center"
-                        VerticalContentAlignment="Center"
-                        Appearance="Secondary"
-                        Background="Transparent"
-                        BorderBrush="Transparent"
-                        Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                        Cursor="Arrow"
-                        Foreground="{DynamicResource TextControlButtonForeground}"
-                        IsTabStop="False">
+                    <controls:Button x:Name="ClearButton"
+                                     Grid.Column="2"
+                                     MinWidth="{StaticResource TextBoxClearButtonHeight}"
+                                     MinHeight="{StaticResource TextBoxClearButtonHeight}"
+                                     Margin="{StaticResource TextBoxClearButtonMargin}"
+                                     Padding="{StaticResource TextBoxClearButtonPadding}"
+                                     HorizontalAlignment="Center"
+                                     VerticalAlignment="Center"
+                                     HorizontalContentAlignment="Center"
+                                     VerticalContentAlignment="Center"
+                                     Appearance="Secondary"
+                                     Background="Transparent"
+                                     BorderBrush="Transparent"
+                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                     Cursor="Arrow"
+                                     Foreground="{DynamicResource TextControlButtonForeground}"
+                                     IsTabStop="False"
+                                     >
                         <controls:Button.Icon>
-                            <controls:SymbolIcon FontSize="{TemplateBinding FontSize}" Symbol="Dismiss24" />
+                            <controls:SymbolIcon FontSize="{TemplateBinding FontSize}"
+                                                 Symbol="Dismiss24"
+                                                 />
                         </controls:Button.Icon>
                     </controls:Button>
 
-                    <ContentPresenter
-                        x:Name="ControlIconRight"
-                        Grid.Column="3"
-                        Margin="{StaticResource TextBoxRightIconMargin}"
-                        VerticalAlignment="Center"
-                        Content="{TemplateBinding Icon}"
-                        TextElement.FontSize="{TemplateBinding FontSize}"
-                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                    <ContentPresenter x:Name="ControlIconRight"
+                                      Grid.Column="3"
+                                      Margin="{StaticResource TextBoxRightIconMargin}"
+                                      VerticalAlignment="Center"
+                                      Content="{TemplateBinding Icon}"
+                                      TextElement.FontSize="{TemplateBinding FontSize}"
+                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                      />
                 </Grid>
             </Border>
             <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
-            <Border
-                x:Name="AccentBorder"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch"
-                BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
-                BorderThickness="{StaticResource TextBoxAccentBorderThemeThickness}"
-                CornerRadius="{TemplateBinding Border.CornerRadius}" />
+            <Border x:Name="AccentBorder"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
+                    BorderThickness="{StaticResource TextBoxAccentBorderThemeThickness}"
+                    CornerRadius="{TemplateBinding Border.CornerRadius}"
+                    />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="CurrentPlaceholderEnabled" Value="False">
-                <Setter TargetName="PlaceholderTextBox" Property="Visibility" Value="Collapsed" />
+                <Setter TargetName="PlaceholderTextBox" Property="Visibility" Value="Collapsed"/>
             </Trigger>
             <Trigger Property="ShowClearButton" Value="False">
-                <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="ClearButton" Property="Margin" Value="0" />
+                <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="ClearButton" Property="Margin" Value="0"/>
             </Trigger>
             <Trigger Property="ClearButtonEnabled" Value="False">
-                <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="ClearButton" Property="Margin" Value="0" />
+                <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="ClearButton" Property="Margin" Value="0"/>
             </Trigger>
             <Trigger Property="IconPlacement" Value="Left">
-                <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="ControlIconRight" Property="Margin" Value="0" />
+                <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="ControlIconRight" Property="Margin" Value="0"/>
             </Trigger>
             <Trigger Property="IconPlacement" Value="Right">
-                <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="ControlIconLeft" Property="Margin" Value="0" />
+                <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="ControlIconLeft" Property="Margin" Value="0"/>
             </Trigger>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="ControlIconRight" Property="Margin" Value="0" />
-                <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="ControlIconLeft" Property="Margin" Value="0" />
+                <Setter TargetName="ControlIconRight" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="ControlIconRight" Property="Margin" Value="0"/>
+                <Setter TargetName="ControlIconLeft" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="ControlIconLeft" Property="Margin" Value="0"/>
             </Trigger>
             <Trigger Property="IsFocused" Value="True">
-                <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2" />
-                <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlFocusedBorderBrush}" />
-                <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
+                <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2"/>
+                <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlFocusedBorderBrush}"/>
+                <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsEnabled" Value="True" />
-                    <Condition Property="IsMouseOver" Value="True" />
-                    <Condition Property="IsFocused" Value="False" />
+                    <Condition Property="IsEnabled" Value="True"/>
+                    <Condition Property="IsMouseOver" Value="True"/>
+                    <Condition Property="IsFocused" Value="False"/>
                 </MultiTrigger.Conditions>
-                <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
+                <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}"/>
             </MultiTrigger>
             <Trigger Property="IsReadOnly" Value="True">
-                <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
-                <Setter TargetName="ClearButton" Property="Margin" Value="0" />
+                <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="ClearButton" Property="Margin" Value="0"/>
             </Trigger>
             <Trigger Property="IsEnabled" Value="True">
-                <Setter Property="Cursor" Value="IBeam" />
+                <Setter Property="Cursor" Value="IBeam"/>
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
-                <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-                <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-                <Setter TargetName="ControlIconLeft" Property="TextElement.Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                <Setter TargetName="ControlIconRight" Property="TextElement.Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                <Setter TargetName="PlaceholderTextBox" Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-                <Setter Property="ClearButtonEnabled" Value="False" />
+                <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}"/>
+                <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}"/>
+                <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}"/>
+                <Setter TargetName="ControlIconLeft" Property="TextElement.Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
+                <Setter TargetName="ControlIconRight" Property="TextElement.Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
+                <Setter TargetName="PlaceholderTextBox" Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
+                <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}"/>
+                <Setter Property="ClearButtonEnabled" Value="False"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="DefaultUiTextBoxTextSelectionEnabledControlTemplate" TargetType="{x:Type controls:TextBox}">
-        <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-            <Border
-                x:Name="ContentBorder"
-                MinWidth="{TemplateBinding MinWidth}"
-                MinHeight="{TemplateBinding MinHeight}"
-                Padding="0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding Border.CornerRadius}"
-                Focusable="False">
-                <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+    <ControlTemplate x:Key="DefaultUiTextBoxTextSelectionEnabledControlTemplate"
+                     TargetType="{x:Type controls:TextBox}"
+                     >
+        <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+              VerticalAlignment="{TemplateBinding VerticalAlignment}"
+              >
+            <Border x:Name="ContentBorder"
+                    MinWidth="{TemplateBinding MinWidth}"
+                    MinHeight="{TemplateBinding MinHeight}"
+                    Padding="0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding Border.CornerRadius}"
+                    Focusable="False"
+                    >
+                <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                      >
                     <Grid Margin="{TemplateBinding Padding}">
-                        <controls:PassiveScrollViewer
-                            x:Name="PART_ContentHost"
-                            CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
-                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                            IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-                            IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
-                            Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
-                            TextElement.Foreground="{TemplateBinding Foreground}"
-                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
+                        <controls:PassiveScrollViewer x:Name="PART_ContentHost"
+                                                      CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                      IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                                                      IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
+                                                      Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
+                                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                      />
                     </Grid>
                 </Grid>
             </Border>
         </Grid>
     </ControlTemplate>
 
-    <Style x:Key="DefaultUiTextBoxStyle" TargetType="{x:Type controls:TextBox}">
+    <Style x:Key="DefaultUiTextBoxStyle"
+           TargetType="{x:Type controls:TextBox}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}"/>
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-        <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />
-        <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource TextBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
-        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="ClearButtonEnabled" Value="True" />
-        <Setter Property="IconPlacement" Value="Left" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}"/>
+        <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource TextControlBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource TextBoxBorderThemeThickness}"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden"/>
+        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}"/>
+        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}"/>
+        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="ClearButtonEnabled" Value="True"/>
+        <Setter Property="IconPlacement" Value="Left"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Style.Triggers>
             <Trigger Property="IsTextSelectionEnabled" Value="False">
-                <Setter Property="Template" Value="{StaticResource DefaultUiTextBoxControlTemplate}" />
+                <Setter Property="Template" Value="{StaticResource DefaultUiTextBoxControlTemplate}"/>
             </Trigger>
             <Trigger Property="IsTextSelectionEnabled" Value="True">
-                <Setter Property="IsReadOnly" Value="True" />
-                <Setter Property="Background" Value="Transparent" />
-                <Setter Property="Padding" Value="0" />
-                <Setter Property="BorderBrush" Value="Transparent" />
-                <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Template" Value="{StaticResource DefaultUiTextBoxTextSelectionEnabledControlTemplate}" />
+                <Setter Property="IsReadOnly" Value="True"/>
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="Padding" Value="0"/>
+                <Setter Property="BorderBrush" Value="Transparent"/>
+                <Setter Property="BorderThickness" Value="0"/>
+                <Setter Property="Template" Value="{StaticResource DefaultUiTextBoxTextSelectionEnabledControlTemplate}"/>
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultTextBoxStyle}" TargetType="{x:Type TextBox}" />
-    <Style BasedOn="{StaticResource DefaultUiTextBoxStyle}" TargetType="{x:Type controls:TextBox}" />
+    <Style BasedOn="{StaticResource DefaultTextBoxStyle}"
+           TargetType="{x:Type TextBox}"
+           />
+    <Style BasedOn="{StaticResource DefaultUiTextBoxStyle}"
+           TargetType="{x:Type controls:TextBox}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ThumbRate/ThumbRate.xaml b/src/Wpf.Ui/Controls/ThumbRate/ThumbRate.xaml
index f9eb98960..daf8fb09c 100644
--- a/src/Wpf.Ui/Controls/ThumbRate/ThumbRate.xaml
+++ b/src/Wpf.Ui/Controls/ThumbRate/ThumbRate.xaml
@@ -5,60 +5,62 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style x:Key="DefaultUiThumbRateStyle" TargetType="{x:Type controls:ThumbRate}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{DynamicResource ThumbRateForeground}" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultUiThumbRateStyle"
+           TargetType="{x:Type controls:ThumbRate}"
+           >
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource ThumbRateForeground}"/>
+        <Setter Property="FontSize" Value="24"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:ThumbRate}">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
 
-                        <controls:Button
-                            Grid.Column="0"
-                            Background="Transparent"
-                            BorderBrush="Transparent"
-                            Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            CommandParameter="{x:Static controls:ThumbRateState.Liked}"
-                            Foreground="{TemplateBinding Foreground}">
-                            <controls:SymbolIcon
-                                x:Name="ThumbsUpButtonIcon"
-                                FontSize="{TemplateBinding FontSize}"
-                                Symbol="ThumbLike24" />
+                        <controls:Button Grid.Column="0"
+                                         Background="Transparent"
+                                         BorderBrush="Transparent"
+                                         Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                         CommandParameter="{x:Static controls:ThumbRateState.Liked}"
+                                         Foreground="{TemplateBinding Foreground}"
+                                         >
+                            <controls:SymbolIcon x:Name="ThumbsUpButtonIcon"
+                                                 FontSize="{TemplateBinding FontSize}"
+                                                 Symbol="ThumbLike24"
+                                                 />
                         </controls:Button>
 
-                        <controls:Button
-                            Grid.Column="1"
-                            Background="Transparent"
-                            BorderBrush="Transparent"
-                            Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            CommandParameter="{x:Static controls:ThumbRateState.Disliked}"
-                            Foreground="{TemplateBinding Foreground}">
-                            <controls:SymbolIcon
-                                x:Name="ThumbsDownButtonIcon"
-                                FontSize="{TemplateBinding FontSize}"
-                                Symbol="ThumbDislike24" />
+                        <controls:Button Grid.Column="1"
+                                         Background="Transparent"
+                                         BorderBrush="Transparent"
+                                         Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                         CommandParameter="{x:Static controls:ThumbRateState.Disliked}"
+                                         Foreground="{TemplateBinding Foreground}"
+                                         >
+                            <controls:SymbolIcon x:Name="ThumbsDownButtonIcon"
+                                                 FontSize="{TemplateBinding FontSize}"
+                                                 Symbol="ThumbDislike24"
+                                                 />
                         </controls:Button>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="State" Value="Liked">
-                            <Setter TargetName="ThumbsUpButtonIcon" Property="Filled" Value="True" />
+                            <Setter TargetName="ThumbsUpButtonIcon" Property="Filled" Value="True"/>
                         </Trigger>
                         <Trigger Property="State" Value="Disliked">
-                            <Setter TargetName="ThumbsDownButtonIcon" Property="Filled" Value="True" />
+                            <Setter TargetName="ThumbsDownButtonIcon" Property="Filled" Value="True"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -66,6 +68,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiThumbRateStyle}" TargetType="{x:Type controls:ThumbRate}" />
+    <Style BasedOn="{StaticResource DefaultUiThumbRateStyle}"
+           TargetType="{x:Type controls:ThumbRate}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/TimePicker/TimePicker.xaml b/src/Wpf.Ui/Controls/TimePicker/TimePicker.xaml
index a4ef2a839..1b8b32e53 100644
--- a/src/Wpf.Ui/Controls/TimePicker/TimePicker.xaml
+++ b/src/Wpf.Ui/Controls/TimePicker/TimePicker.xaml
@@ -1,109 +1,115 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                    >
 
     <Thickness x:Key="TimePickerBorderThemeThickness">1,1,1,1</Thickness>
 
-    <Style x:Key="DefaultUiTimePickerStyle" TargetType="{x:Type controls:TimePicker}">
+    <Style x:Key="DefaultUiTimePickerStyle"
+           TargetType="{x:Type controls:TimePicker}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}"/>
         <!--  Universal WPF UI ContextMenu  -->
-        <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDefault}" />
-        <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource TimePickerBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDefault}"/>
+        <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource TimePickerBorderThemeThickness}"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}"/>
+        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}"/>
+        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:TimePicker}">
-                    <Grid
-                        Width="{TemplateBinding Width}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                        <Border
-                            x:Name="ContentBorder"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            Padding="0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}">
+                    <Grid Width="{TemplateBinding Width}"
+                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                          >
+                        <Border x:Name="ContentBorder"
+                                MinWidth="{TemplateBinding MinWidth}"
+                                MinHeight="{TemplateBinding MinHeight}"
+                                Padding="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                >
                             <Grid>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
                                 </Grid.ColumnDefinitions>
 
-                                <Grid x:Name="GridColumnHour" Grid.Column="0">
-                                    <TextBlock
-                                        Margin="6"
-                                        HorizontalAlignment="Center"
-                                        Foreground="{TemplateBinding Foreground}"
-                                        Text="hour" />
+                                <Grid x:Name="GridColumnHour"
+                                      Grid.Column="0"
+                                      >
+                                    <TextBlock Margin="6"
+                                               HorizontalAlignment="Center"
+                                               Foreground="{TemplateBinding Foreground}"
+                                               Text="hour"
+                                               />
                                 </Grid>
-                                <Border
-                                    x:Name="GridColumnMinute"
-                                    Grid.Column="1"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="1,0,1,0">
-                                    <TextBlock
-                                        Margin="6"
-                                        HorizontalAlignment="Center"
-                                        Foreground="{TemplateBinding Foreground}"
-                                        Text="minute" />
+                                <Border x:Name="GridColumnMinute"
+                                        Grid.Column="1"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="1,0,1,0"
+                                        >
+                                    <TextBlock Margin="6"
+                                               HorizontalAlignment="Center"
+                                               Foreground="{TemplateBinding Foreground}"
+                                               Text="minute"
+                                               />
                                 </Border>
-                                <Grid x:Name="GridColumnType" Grid.Column="2">
-                                    <TextBlock
-                                        Margin="6"
-                                        HorizontalAlignment="Center"
-                                        Foreground="{TemplateBinding Foreground}"
-                                        Text="AM" />
+                                <Grid x:Name="GridColumnType"
+                                      Grid.Column="2"
+                                      >
+                                    <TextBlock Margin="6"
+                                               HorizontalAlignment="Center"
+                                               Foreground="{TemplateBinding Foreground}"
+                                               Text="AM"
+                                               />
                                 </Grid>
                             </Grid>
                         </Border>
 
                         <Popup x:Name="TimePickerPopup">
                             <Border>
-                                <TextBlock Text="Todo" />
+                                <TextBlock Text="Todo"/>
                             </Border>
                         </Popup>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPointerOver}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPointerOver}" />
+                            <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPointerOver}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPointerOver}"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundDisabled}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushDisabled}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}" />
+                            <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundDisabled}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushDisabled}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}"/>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPressed}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushPressed}" />
-                            <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPressed}" />
+                            <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPressed}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushPressed}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPressed}"/>
                         </Trigger>
                         <Trigger Property="ClockIdentifier" Value="Clock24Hour">
-                            <Setter TargetName="GridColumnType" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="GridColumnType" Property="Visibility" Value="Hidden"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -111,6 +117,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiTimePickerStyle}" TargetType="{x:Type controls:TimePicker}" />
+    <Style BasedOn="{StaticResource DefaultUiTimePickerStyle}"
+           TargetType="{x:Type controls:TimePicker}"
+           />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
index 7dbc9a0f7..52715af5b 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
@@ -4,199 +4,155 @@
 // All Rights Reserved.
 
 using System.Diagnostics;
+using System.Windows.Controls;
 using System.Windows.Input;
+using Wpf.Ui.Appearance;
 using Wpf.Ui.Designer;
-using Wpf.Ui.Extensions;
 using Wpf.Ui.Input;
-using Wpf.Ui.Interop;
+#pragma warning disable WPF0041
 
 // ReSharper disable once CheckNamespace
 namespace Wpf.Ui.Controls;
 
-/// <summary>
-/// Custom navigation buttons for the window.
-/// </summary>
-[TemplatePart(Name = ElementMainGrid, Type = typeof(System.Windows.Controls.Grid))]
-[TemplatePart(Name = ElementIcon, Type = typeof(System.Windows.Controls.Image))]
-[TemplatePart(Name = ElementHelpButton, Type = typeof(TitleBarButton))]
-[TemplatePart(Name = ElementMinimizeButton, Type = typeof(TitleBarButton))]
-[TemplatePart(Name = ElementMaximizeButton, Type = typeof(TitleBarButton))]
-[TemplatePart(Name = ElementRestoreButton, Type = typeof(TitleBarButton))]
-[TemplatePart(Name = ElementCloseButton, Type = typeof(TitleBarButton))]
-public class TitleBar : System.Windows.Controls.Control, IThemeControl
+[TemplatePart(Name = "PART_Icon", Type = typeof(ContentPresenter))]
+public class TitleBar : Control, IThemeControl
 {
-    private const string ElementIcon = "PART_Icon";
-    private const string ElementMainGrid = "PART_MainGrid";
-    private const string ElementHelpButton = "PART_HelpButton";
-    private const string ElementMinimizeButton = "PART_MinimizeButton";
-    private const string ElementMaximizeButton = "PART_MaximizeButton";
-    private const string ElementRestoreButton = "PART_RestoreButton";
-    private const string ElementCloseButton = "PART_CloseButton";
-
-    private static DpiScale? dpiScale;
-
+    private Window _currentWindow = null!;
     private DependencyObject? _parentWindow;
+    private ContentPresenter? _iconPresenter;
+    private static DpiScale? _dpiScale;
+    private readonly Point _relativePoint = new(-15, 48);
 
     /// <summary>Identifies the <see cref="ApplicationTheme"/> dependency property.</summary>
-    public static readonly DependencyProperty ApplicationThemeProperty = DependencyProperty.Register(
-        nameof(ApplicationTheme),
-        typeof(Appearance.ApplicationTheme),
-        typeof(TitleBar),
-        new PropertyMetadata(Appearance.ApplicationTheme.Unknown)
-    );
+    public static readonly DependencyProperty ApplicationThemeProperty =
+        DependencyProperty.Register(
+            nameof(ApplicationTheme),
+            typeof(ApplicationTheme),
+            typeof(TitleBar),
+            new PropertyMetadata(ApplicationTheme.Unknown)
+            );
 
     /// <summary>Identifies the <see cref="Title"/> dependency property.</summary>
-    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register(
-        nameof(Title),
-        typeof(string),
-        typeof(TitleBar),
-        new PropertyMetadata(null)
-    );
+    public static readonly DependencyProperty TitleProperty =
+        DependencyProperty.Register(
+            nameof(Title),
+            typeof(string),
+            typeof(TitleBar),
+            new PropertyMetadata(null)
+            );
 
     /// <summary>Identifies the <see cref="Header"/> dependency property.</summary>
-    public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
-        nameof(Header),
-        typeof(object),
-        typeof(TitleBar),
-        new PropertyMetadata(null)
-    );
-
-    /// <summary>Identifies the <see cref="ButtonsForeground"/> dependency property.</summary>
-    public static readonly DependencyProperty ButtonsForegroundProperty = DependencyProperty.Register(
-        nameof(ButtonsForeground),
-        typeof(Brush),
-        typeof(TitleBar),
-        new FrameworkPropertyMetadata(
-            SystemColors.ControlTextBrush,
-            FrameworkPropertyMetadataOptions.Inherits
-        )
-    );
-
-    /// <summary>Identifies the <see cref="ButtonsBackground"/> dependency property.</summary>
-    public static readonly DependencyProperty ButtonsBackgroundProperty = DependencyProperty.Register(
-        nameof(ButtonsBackground),
-        typeof(Brush),
-        typeof(TitleBar),
-        new FrameworkPropertyMetadata(SystemColors.ControlBrush, FrameworkPropertyMetadataOptions.Inherits)
-    );
+    public static readonly DependencyProperty HeaderProperty =
+        DependencyProperty.Register(
+            nameof(Header),
+            typeof(object),
+            typeof(TitleBar),
+            new PropertyMetadata(null)
+            );
 
-    /// <summary>Identifies the <see cref="IsMaximized"/> dependency property.</summary>
-    public static readonly DependencyProperty IsMaximizedProperty = DependencyProperty.Register(
-        nameof(IsMaximized),
-        typeof(bool),
-        typeof(TitleBar),
-        new PropertyMetadata(false)
-    );
+    /// <summary>Identifies the <see cref="AdditionalControls"/> dependency property.</summary>
+    public static readonly DependencyProperty AdditionalControlsProperty =
+        DependencyProperty.Register(
+            nameof(AdditionalControls),
+            typeof(object),
+            typeof(TitleBar),
+            new PropertyMetadata(null)
+            );
 
-    /// <summary>Identifies the <see cref="ForceShutdown"/> dependency property.</summary>
-    public static readonly DependencyProperty ForceShutdownProperty = DependencyProperty.Register(
-        nameof(ForceShutdown),
-        typeof(bool),
-        typeof(TitleBar),
-        new PropertyMetadata(false)
-    );
+    /// <summary>Identifies the <see cref="Icon"/> dependency property.</summary>
+    public static readonly DependencyProperty IconProperty =
+        DependencyProperty.Register(
+            nameof(Icon),
+            typeof(IconElement),
+            typeof(TitleBar),
+            new PropertyMetadata(null)
+            );
+
+    /// <summary>Identifies the <see cref="CloseWindowByDoubleClickOnIcon"/> dependency property.</summary>
+    public static readonly DependencyProperty CloseWindowByDoubleClickOnIconProperty =
+        DependencyProperty.Register(
+            nameof(CloseWindowByDoubleClickOnIcon),
+            typeof(bool),
+            typeof(TitleBar),
+            new PropertyMetadata(false)
+        );
 
     /// <summary>Identifies the <see cref="ShowMaximize"/> dependency property.</summary>
-    public static readonly DependencyProperty ShowMaximizeProperty = DependencyProperty.Register(
-        nameof(ShowMaximize),
-        typeof(bool),
-        typeof(TitleBar),
-        new PropertyMetadata(true)
-    );
+    public static readonly DependencyProperty ShowMaximizeProperty =
+        DependencyProperty.Register(
+            nameof(ShowMaximize),
+            typeof(bool),
+            typeof(TitleBar),
+            new PropertyMetadata(true)
+            );
 
     /// <summary>Identifies the <see cref="ShowMinimize"/> dependency property.</summary>
-    public static readonly DependencyProperty ShowMinimizeProperty = DependencyProperty.Register(
-        nameof(ShowMinimize),
-        typeof(bool),
-        typeof(TitleBar),
-        new PropertyMetadata(true)
-    );
+    public static readonly DependencyProperty ShowMinimizeProperty =
+        DependencyProperty.Register(
+            nameof(ShowMinimize),
+            typeof(bool),
+            typeof(TitleBar),
+            new PropertyMetadata(true)
+            );
 
     /// <summary>Identifies the <see cref="ShowHelp"/> dependency property.</summary>
-    public static readonly DependencyProperty ShowHelpProperty = DependencyProperty.Register(
-        nameof(ShowHelp),
-        typeof(bool),
-        typeof(TitleBar),
-        new PropertyMetadata(false)
-    );
+    public static readonly DependencyProperty ShowHelpProperty =
+        DependencyProperty.Register(
+            nameof(ShowHelp),
+            typeof(bool),
+            typeof(TitleBar),
+            new PropertyMetadata(false)
+            );
 
     /// <summary>Identifies the <see cref="ShowClose"/> dependency property.</summary>
-    public static readonly DependencyProperty ShowCloseProperty = DependencyProperty.Register(
-        nameof(ShowClose),
-        typeof(bool),
-        typeof(TitleBar),
-        new PropertyMetadata(true)
-    );
+    public static readonly DependencyProperty ShowCloseProperty =
+        DependencyProperty.Register(
+            nameof(ShowClose),
+            typeof(bool),
+            typeof(TitleBar),
+            new PropertyMetadata(true)
+            );
 
     /// <summary>Identifies the <see cref="CanMaximize"/> dependency property.</summary>
-    public static readonly DependencyProperty CanMaximizeProperty = DependencyProperty.Register(
-        nameof(CanMaximize),
-        typeof(bool),
-        typeof(TitleBar),
-        new PropertyMetadata(true)
-    );
-
-    /// <summary>Identifies the <see cref="Icon"/> dependency property.</summary>
-    public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
-        nameof(Icon),
-        typeof(IconElement),
-        typeof(TitleBar),
-        new PropertyMetadata(null)
-    );
+    public static readonly DependencyProperty CanMaximizeProperty =
+        DependencyProperty.Register(
+            nameof(CanMaximize),
+            typeof(bool),
+            typeof(TitleBar),
+            new PropertyMetadata(true)
+        );
 
-    /// <summary>Identifies the <see cref="CloseWindowByDoubleClickOnIcon"/> dependency property.</summary>
-    public static readonly DependencyProperty CloseWindowByDoubleClickOnIconProperty =
+    /// <summary>Identifies the <see cref="IsMaximized"/> dependency property.</summary>
+    public static readonly DependencyProperty IsMaximizedProperty =
         DependencyProperty.Register(
-            nameof(CloseWindowByDoubleClickOnIcon),
+            nameof(IsMaximized),
             typeof(bool),
             typeof(TitleBar),
             new PropertyMetadata(false)
         );
 
-    /// <summary>Identifies the <see cref="CloseClicked"/> routed event.</summary>
-    public static readonly RoutedEvent CloseClickedEvent = EventManager.RegisterRoutedEvent(
-        nameof(CloseClicked),
-        RoutingStrategy.Bubble,
-        typeof(TypedEventHandler<TitleBar, RoutedEventArgs>),
-        typeof(TitleBar)
-    );
-
-    /// <summary>Identifies the <see cref="MaximizeClicked"/> routed event.</summary>
-    public static readonly RoutedEvent MaximizeClickedEvent = EventManager.RegisterRoutedEvent(
-        nameof(MaximizeClicked),
-        RoutingStrategy.Bubble,
-        typeof(TypedEventHandler<TitleBar, RoutedEventArgs>),
-        typeof(TitleBar)
-    );
-
-    /// <summary>Identifies the <see cref="MinimizeClicked"/> routed event.</summary>
-    public static readonly RoutedEvent MinimizeClickedEvent = EventManager.RegisterRoutedEvent(
-        nameof(MinimizeClicked),
-        RoutingStrategy.Bubble,
-        typeof(TypedEventHandler<TitleBar, RoutedEventArgs>),
-        typeof(TitleBar)
-    );
-
-    /// <summary>Identifies the <see cref="HelpClicked"/> routed event.</summary>
-    public static readonly RoutedEvent HelpClickedEvent = EventManager.RegisterRoutedEvent(
-        nameof(HelpClicked),
-        RoutingStrategy.Bubble,
-        typeof(TypedEventHandler<TitleBar, RoutedEventArgs>),
-        typeof(TitleBar)
-    );
-
-    /// <summary>Identifies the <see cref="TemplateButtonCommand"/> dependency property.</summary>
-    public static readonly DependencyProperty TemplateButtonCommandProperty = DependencyProperty.Register(
-        nameof(TemplateButtonCommand),
-        typeof(IRelayCommand),
-        typeof(TitleBar),
-        new PropertyMetadata(null)
-    );
+    /// <summary>Identifies the <see cref="ForceShutdown"/> dependency property.</summary>
+    public static readonly DependencyProperty ForceShutdownProperty =
+        DependencyProperty.Register(
+            nameof(ForceShutdown),
+            typeof(bool),
+            typeof(TitleBar),
+            new PropertyMetadata(false)
+            );
+
+    /// <summary>Identifies the <see cref="UseTrayMenu"/> dependency property.</summary>
+    public static readonly DependencyProperty UseTrayMenuProperty =
+        DependencyProperty.Register(
+            nameof(UseTrayMenu),
+            typeof(bool),
+            typeof(TitleBar),
+            new PropertyMetadata(false)
+            );
 
     /// <inheritdoc />
-    public Appearance.ApplicationTheme ApplicationTheme
+    public ApplicationTheme ApplicationTheme
     {
-        get => (Appearance.ApplicationTheme)GetValue(ApplicationThemeProperty);
+        get => (ApplicationTheme)GetValue(ApplicationThemeProperty);
         set => SetValue(ApplicationThemeProperty, value);
     }
 
@@ -210,56 +166,43 @@ public string? Title
     }
 
     /// <summary>
-    /// Gets or sets the content displayed in the <see cref="TitleBar"/>.
+    /// Gets or sets the content displayed in the <see cref="Header"/> section.
     /// </summary>
     public object? Header
     {
-        get => GetValue(HeaderProperty);
+        get => (object?)GetValue(HeaderProperty);
         set => SetValue(HeaderProperty, value);
     }
 
     /// <summary>
-    /// Gets or sets the foreground of the navigation buttons.
+    /// Gets or sets the content displayed in the <see cref="AdditionalControls"/> section.
     /// </summary>
-    [Bindable(true)]
-    [Category("Appearance")]
-    public Brush ButtonsForeground
+    public object? AdditionalControls
     {
-        get => (Brush)GetValue(ButtonsForegroundProperty);
-        set => SetValue(ButtonsForegroundProperty, value);
+        get => (object?)GetValue(AdditionalControlsProperty);
+        set => SetValue(AdditionalControlsProperty, value);
     }
 
     /// <summary>
-    /// Gets or sets the background of the navigation buttons when hovered.
-    /// </summary>
-    [Bindable(true)]
-    [Category("Appearance")]
-    public Brush ButtonsBackground
-    {
-        get => (Brush)GetValue(ButtonsBackgroundProperty);
-        set => SetValue(ButtonsBackgroundProperty, value);
-    }
-
-    /// <summary>
-    /// Gets a value indicating whether the current window is maximized.
+    /// Gets or sets the titlebar icon.
     /// </summary>
-    public bool IsMaximized
+    public IconElement? Icon
     {
-        get => (bool)GetValue(IsMaximizedProperty);
-        internal set => SetValue(IsMaximizedProperty, value);
+        get => (IconElement?)GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
     }
 
     /// <summary>
-    /// Gets or sets a value indicating whether the controls affect main application window.
+    /// Gets or sets a value indicating whether the window can be closed by double-clicking on the icon
     /// </summary>
-    public bool ForceShutdown
+    public bool CloseWindowByDoubleClickOnIcon
     {
-        get => (bool)GetValue(ForceShutdownProperty);
-        set => SetValue(ForceShutdownProperty, value);
+        get => (bool)GetValue(CloseWindowByDoubleClickOnIconProperty);
+        set => SetValue(CloseWindowByDoubleClickOnIconProperty, value);
     }
 
     /// <summary>
-    /// Gets or sets a value indicating whether to show the maximize button.
+    /// Gets or sets a value indicating whether to show the minimize button.
     /// </summary>
     public bool ShowMaximize
     {
@@ -268,7 +211,7 @@ public bool ShowMaximize
     }
 
     /// <summary>
-    /// Gets or sets a value indicating whether to show the minimize button.
+    /// Gets or sets a value indicating whether to show the maximize button.
     /// </summary>
     public bool ShowMinimize
     {
@@ -304,184 +247,140 @@ public bool CanMaximize
     }
 
     /// <summary>
-    /// Gets or sets the titlebar icon.
+    /// Gets or sets a value indicating whether the current window is maximized.
     /// </summary>
-    public IconElement? Icon
-    {
-        get => (IconElement?)GetValue(IconProperty);
-        set => SetValue(IconProperty, value);
-    }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the window can be closed by double clicking on the icon
-    /// </summary>
-    public bool CloseWindowByDoubleClickOnIcon
+    public bool IsMaximized
     {
-        get => (bool)GetValue(CloseWindowByDoubleClickOnIconProperty);
-        set => SetValue(CloseWindowByDoubleClickOnIconProperty, value);
+        get => (bool)GetValue(IsMaximizedProperty);
+        set => SetValue(IsMaximizedProperty, value);
     }
 
     /// <summary>
-    /// Event triggered after clicking close button.
+    /// Gets or sets a value indicating whether the controls affect main application window.
     /// </summary>
-    public event TypedEventHandler<TitleBar, RoutedEventArgs> CloseClicked
+    public bool ForceShutdown
     {
-        add => AddHandler(CloseClickedEvent, value);
-        remove => RemoveHandler(CloseClickedEvent, value);
+        get => (bool)GetValue(ForceShutdownProperty);
+        set => SetValue(ForceShutdownProperty, value);
     }
 
     /// <summary>
-    /// Event triggered after clicking maximize or restore button.
+    /// Gets or sets a value indicating whether the <see cref="Application"/> closes or hides if using a tray menu.
     /// </summary>
-    public event TypedEventHandler<TitleBar, RoutedEventArgs> MaximizeClicked
+    public bool UseTrayMenu
     {
-        add => AddHandler(MaximizeClickedEvent, value);
-        remove => RemoveHandler(MaximizeClickedEvent, value);
+        get => (bool)GetValue(UseTrayMenuProperty);
+        set => SetValue(UseTrayMenuProperty, value);
     }
 
     /// <summary>
-    /// Event triggered after clicking minimize button.
+    /// Gets or sets what <see cref="Action"/> should be executed when the Help button is clicked.
     /// </summary>
-    public event TypedEventHandler<TitleBar, RoutedEventArgs> MinimizeClicked
-    {
-        add => AddHandler(MinimizeClickedEvent, value);
-        remove => RemoveHandler(MinimizeClickedEvent, value);
-    }
+    public Action<TitleBar, Window>? HelpActionOverride { get; set; }
 
     /// <summary>
-    /// Event triggered after clicking help button
+    /// Gets or sets what <see cref="Action"/> should be executed when the Minimize button is clicked.
     /// </summary>
-    public event TypedEventHandler<TitleBar, RoutedEventArgs> HelpClicked
-    {
-        add => AddHandler(HelpClickedEvent, value);
-        remove => RemoveHandler(HelpClickedEvent, value);
-    }
+    public Action<TitleBar, Window>? MinimizeActionOverride { get; set; }
 
     /// <summary>
-    /// Gets the command triggered when clicking the titlebar button.
+    /// Gets or sets what <see cref="Action"/> should be executed when the Maximize button is clicked.
     /// </summary>
-    public IRelayCommand TemplateButtonCommand => (IRelayCommand)GetValue(TemplateButtonCommandProperty);
+    public Action<TitleBar, Window>? MaximizeActionOverride { get; set; }
 
     /// <summary>
-    /// Gets or sets the <see cref="Action"/> that should be executed when the Maximize button is clicked."/>
+    /// Gets or sets what <see cref="Action"/> should be executed when the Close button is clicked.
     /// </summary>
-    public Action<TitleBar, System.Windows.Window>? MaximizeActionOverride { get; set; }
+    public Action<TitleBar, Window>? CloseActionOverride { get; set; }
 
     /// <summary>
-    /// Gets or sets what <see cref="Action"/> should be executed when the Minimize button is clicked.
+    /// Gets the command triggered when clicking the titlebar button.
     /// </summary>
-    public Action<TitleBar, System.Windows.Window>? MinimizeActionOverride { get; set; }
-
-    private readonly TitleBarButton[] _buttons = new TitleBarButton[4];
-    private System.Windows.Window _currentWindow = null!;
-
-    /*private System.Windows.Controls.Grid _mainGrid = null!;*/
-    private System.Windows.Controls.ContentPresenter _icon = null!;
+    public RelayCommand<string> ButtonCommand { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TitleBar"/> class and sets the default <see cref="FrameworkElement.Loaded"/> event.
     /// </summary>
     public TitleBar()
     {
-        SetValue(TemplateButtonCommandProperty, new RelayCommand<TitleBarButtonType>(OnTemplateButtonClick));
-
-        dpiScale ??= VisualTreeHelper.GetDpi(this);
+        _dpiScale ??= VisualTreeHelper.GetDpi(this);
 
         Loaded += OnLoaded;
-        Unloaded += OnUnloaded;
-    }
-
-    /// <inheritdoc />
-    protected override void OnInitialized(EventArgs e)
-    {
-        base.OnInitialized(e);
-
-        SetCurrentValue(ApplicationThemeProperty, Appearance.ApplicationThemeManager.GetAppTheme());
-        Appearance.ApplicationThemeManager.Changed += OnThemeChanged;
-    }
-
-    protected virtual void OnLoaded(object sender, RoutedEventArgs e)
-    {
-        if (DesignerHelper.IsInDesignMode)
+        Unloaded += (_, _) =>
         {
-            return;
-        }
-
-        _currentWindow =
-            System.Windows.Window.GetWindow(this) ?? throw new InvalidOperationException("Window is null");
-        _currentWindow.StateChanged += OnParentWindowStateChanged;
-        _currentWindow.ContentRendered += OnWindowContentRendered;
-    }
+            ApplicationThemeManager.Changed -= OnThemeChanged;
+        };
+        MouseDoubleClick += (_, ie) =>
+        {
+            if (IsMouseOverButton(this))
+            {
+                return;
+            }
 
-    private void OnUnloaded(object sender, RoutedEventArgs e)
-    {
-        Loaded -= OnLoaded;
-        Unloaded -= OnUnloaded;
+            MaximizeWindow();
+            ie.Handled = true;
+        };
+        ButtonCommand = new RelayCommand<string>(
+            execute: command =>
+        {
+            if (command is null)
+            {
+                return;
+            }
 
-        Appearance.ApplicationThemeManager.Changed -= OnThemeChanged;
+            switch (command)
+            {
+                case "Help":
+                    HelpClicked();
+                    break;
+                case "Minimize":
+                    MinimizeWindow();
+                    break;
+                case "Maximize":
+                    MaximizeWindow();
+                    break;
+                case "Close":
+                    CloseWindow();
+                    break;
+            }
+        },
+            canExecute: _ => true
+            );
     }
 
     /// <summary>
-    /// Invoked whenever application code or an internal process,
-    /// such as a rebuilding layout pass, calls the ApplyTemplate method.
+    /// Gets or sets a value indicating if the mouse is over any <see cref="Button"/>.
     /// </summary>
-    public override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
+    /// <returns><see cref="bool"/></returns>
+    private static bool IsMouseOverButton(FrameworkElement? titleBar) =>
+        FindVisualChildren<Button>(titleBar).Any(button => button.IsMouseOver);
 
-        _parentWindow = VisualTreeHelper.GetParent(this);
-
-        while (_parentWindow is not null and not Window)
+    private static IEnumerable<T> FindVisualChildren<T>(DependencyObject? depObj)
+        where T : DependencyObject
+    {
+        if (depObj == null)
         {
-            _parentWindow = VisualTreeHelper.GetParent(_parentWindow);
+            yield break;
         }
 
-        MouseRightButtonUp += TitleBar_MouseRightButtonUp;
-
-        /*_mainGrid = GetTemplateChild<System.Windows.Controls.Grid>(ElementMainGrid);*/
-        _icon = GetTemplateChild<System.Windows.Controls.ContentPresenter>(ElementIcon);
-
-        TitleBarButton helpButton = GetTemplateChild<TitleBarButton>(ElementHelpButton);
-        TitleBarButton minimizeButton = GetTemplateChild<TitleBarButton>(ElementMinimizeButton);
-        TitleBarButton maximizeButton = GetTemplateChild<TitleBarButton>(ElementMaximizeButton);
-        TitleBarButton closeButton = GetTemplateChild<TitleBarButton>(ElementCloseButton);
-
-        _buttons[0] = maximizeButton;
-        _buttons[1] = minimizeButton;
-        _buttons[2] = closeButton;
-        _buttons[3] = helpButton;
-    }
-
-    /// <summary>
-    /// This virtual method is triggered when the app's theme changes.
-    /// </summary>
-    protected virtual void OnThemeChanged(
-        Appearance.ApplicationTheme currentApplicationTheme,
-        Color systemAccent
-    )
-    {
-        Debug.WriteLine(
-            $"INFO | {typeof(TitleBar)} received theme -  {currentApplicationTheme}",
-            "Wpf.Ui.TitleBar"
-        );
+        for (int i = 0; i < VisualTreeHelper.GetChildrenCount(depObj); i++)
+        {
+            DependencyObject child = VisualTreeHelper.GetChild(depObj, i);
+            if (child is T t)
+            {
+                yield return t;
+            }
 
-        SetCurrentValue(ApplicationThemeProperty, currentApplicationTheme);
+            foreach (T childOfChild in FindVisualChildren<T>(child))
+            {
+                yield return childOfChild;
+            }
+        }
     }
 
-    private void CloseWindow()
+    private void HelpClicked()
     {
-        Debug.WriteLine(
-            $"INFO | {typeof(TitleBar)}.CloseWindow:ForceShutdown -  {ForceShutdown}",
-            "Wpf.Ui.TitleBar"
-        );
-
-        if (ForceShutdown)
-        {
-            UiApplication.Current.Shutdown();
-            return;
-        }
-
-        _currentWindow.Close();
+        HelpActionOverride?.Invoke(this, _currentWindow);
     }
 
     private void MinimizeWindow()
@@ -489,7 +388,6 @@ private void MinimizeWindow()
         if (MinimizeActionOverride is not null)
         {
             MinimizeActionOverride(this, _currentWindow);
-
             return;
         }
 
@@ -506,167 +404,163 @@ private void MaximizeWindow()
         if (MaximizeActionOverride is not null)
         {
             MaximizeActionOverride(this, _currentWindow);
-
             return;
         }
 
-        if (_currentWindow.WindowState == WindowState.Normal)
-        {
-            SetCurrentValue(IsMaximizedProperty, true);
-            _currentWindow.SetCurrentValue(Window.WindowStateProperty, WindowState.Maximized);
-        }
-        else
+        switch (_currentWindow.WindowState)
         {
-            SetCurrentValue(IsMaximizedProperty, false);
-            _currentWindow.SetCurrentValue(Window.WindowStateProperty, WindowState.Normal);
+            case WindowState.Normal:
+                _currentWindow.SetCurrentValue(Window.WindowStateProperty, WindowState.Maximized);
+                break;
+            case WindowState.Maximized:
+                _currentWindow.SetCurrentValue(Window.WindowStateProperty, WindowState.Normal);
+                break;
+            case WindowState.Minimized:
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
         }
     }
 
-    private void OnParentWindowStateChanged(object? sender, EventArgs e)
+    private void CloseWindow()
     {
-        if (IsMaximized != (_currentWindow.WindowState == WindowState.Maximized))
+        if (CloseActionOverride is not null)
         {
-            SetCurrentValue(IsMaximizedProperty, _currentWindow.WindowState == WindowState.Maximized);
+            CloseActionOverride(this, _currentWindow);
+            return;
         }
-    }
 
-    private void OnTemplateButtonClick(TitleBarButtonType buttonType)
-    {
-        switch (buttonType)
+        if (ForceShutdown)
         {
-            case TitleBarButtonType.Maximize
-            or TitleBarButtonType.Restore:
-                RaiseEvent(new RoutedEventArgs(MaximizeClickedEvent, this));
-                MaximizeWindow();
-                break;
+            UiApplication.Current.Shutdown();
+            return;
+        }
 
-            case TitleBarButtonType.Close:
-                RaiseEvent(new RoutedEventArgs(CloseClickedEvent, this));
-                CloseWindow();
-                break;
+        if (UseTrayMenu)
+        {
+            _currentWindow.Hide();
+            return;
+        }
 
-            case TitleBarButtonType.Minimize:
-                RaiseEvent(new RoutedEventArgs(MinimizeClickedEvent, this));
-                MinimizeWindow();
-                break;
+        _currentWindow.Close();
+    }
 
-            case TitleBarButtonType.Help:
-                RaiseEvent(new RoutedEventArgs(HelpClickedEvent, this));
-                break;
+    /// <summary>
+    /// Show 'SystemMenu' on mouse right button up.
+    /// </summary>
+    private void TitleBar_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
+    {
+        Point point = PointToScreen(e.GetPosition(this));
+
+        if (_dpiScale is null)
+        {
+            throw new InvalidOperationException("dpiScale is not initialized.");
         }
+
+        SystemCommands.ShowSystemMenu(
+            _parentWindow as Window,
+            new Point(point.X / _dpiScale.Value.DpiScaleX, point.Y / _dpiScale.Value.DpiScaleY)
+        );
     }
 
     /// <summary>
-    ///     Listening window hooks after rendering window content to SizeToContent support
+    /// Invoked whenever application code or an internal process,
+    /// such as a rebuilding layout pass, calls the ApplyTemplate method.
     /// </summary>
-    private void OnWindowContentRendered(object? sender, EventArgs e)
+    public override void OnApplyTemplate()
     {
-        if (sender is not Window window)
+        base.OnApplyTemplate();
+
+        _parentWindow = VisualTreeHelper.GetParent(this);
+
+        while (_parentWindow is not null and not Window)
         {
-            return;
+            _parentWindow = VisualTreeHelper.GetParent(_parentWindow);
         }
 
-        window.ContentRendered -= OnWindowContentRendered;
-
-        IntPtr handle = new WindowInteropHelper(window).Handle;
-        HwndSource windowSource =
-            HwndSource.FromHwnd(handle) ?? throw new InvalidOperationException("Window source is null");
-        windowSource.AddHook(HwndSourceHook);
+        _iconPresenter = GetTemplateChild("PART_Icon") as ContentPresenter;
+        MouseRightButtonUp += TitleBar_MouseRightButtonUp;
     }
 
-    private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+    protected virtual void OnLoaded(object sender, RoutedEventArgs e)
     {
-        var message = (User32.WM)msg;
-
-        if (
-            message
-            is not (
-                User32.WM.NCHITTEST
-                or User32.WM.NCMOUSELEAVE
-                or User32.WM.NCLBUTTONDOWN
-                or User32.WM.NCLBUTTONUP
-            )
-        )
+        if (DesignerHelper.IsInDesignMode)
         {
-            return IntPtr.Zero;
+            return;
         }
 
-        foreach (TitleBarButton button in _buttons)
+        _currentWindow = Window.GetWindow(this) ?? throw new InvalidOperationException("Window is null");
+        _currentWindow.StateChanged += (_, _) =>
         {
-            if (!button.ReactToHwndHook(message, lParam, out IntPtr returnIntPtr))
+            if (IsMaximized != (_currentWindow.WindowState == WindowState.Maximized))
             {
-                continue;
+                SetCurrentValue(IsMaximizedProperty, _currentWindow.WindowState == WindowState.Maximized);
             }
+        };
 
-            // Fix for when sometimes, button hover backgrounds aren't cleared correctly, causing multiple buttons to appear as if hovered.
-            foreach (TitleBarButton anotherButton in _buttons)
+        MouseMove += (_, te) =>
+        {
+            if (te.LeftButton != MouseButtonState.Pressed)
             {
-                if (anotherButton == button)
-                {
-                    continue;
-                }
-
-                if (anotherButton.IsHovered && button.IsHovered)
-                {
-                    anotherButton.RemoveHover();
-                }
+                return;
             }
 
-            handled = true;
-            return returnIntPtr;
-        }
+            if (_currentWindow.WindowState == WindowState.Maximized)
+            {
+                // Do not use DependencyProperty to set the window state and postion here.
+                Point mouseRelativeToScreen = te.GetPosition(null);
+                var screenWidth = SystemParameters.PrimaryScreenWidth;
+                var screenHeight = SystemParameters.PrimaryScreenHeight;
+                _currentWindow.WindowState = WindowState.Normal;
+                var newLeft = mouseRelativeToScreen.X - (_currentWindow.ActualWidth / 2);
+                var newTop = mouseRelativeToScreen.Y - 10;
+                newLeft = Math.Max(0, Math.Min(newLeft, screenWidth - _currentWindow.ActualWidth));
+                newTop = Math.Max(0, Math.Min(newTop, screenHeight - _currentWindow.ActualHeight));
+                _currentWindow.Left = newLeft;
+                _currentWindow.Top = newTop;
+            }
 
-        bool isMouseOverHeaderContent = false;
+            _currentWindow.DragMove();
+        };
 
-        if (message == User32.WM.NCHITTEST && Header is UIElement headerUiElement)
+        if (_iconPresenter == null)
         {
-            isMouseOverHeaderContent = headerUiElement.IsMouseOverElement(lParam);
+            return;
         }
 
-        switch (message)
+        _iconPresenter.MouseLeftButtonDown += (_, ie) =>
         {
-            case User32.WM.NCHITTEST when CloseWindowByDoubleClickOnIcon && _icon.IsMouseOverElement(lParam):
-                // Ideally, clicking on the icon should open the system menu, but when the system menu is opened manually, double-clicking on the icon does not close the window
-                handled = true;
-                return (IntPtr)User32.WM_NCHITTEST.HTSYSMENU;
-            case User32.WM.NCHITTEST when this.IsMouseOverElement(lParam) && !isMouseOverHeaderContent:
-                handled = true;
-                return (IntPtr)User32.WM_NCHITTEST.HTCAPTION;
-            default:
-                return IntPtr.Zero;
-        }
+            switch (CloseWindowByDoubleClickOnIcon)
+            {
+                case true when ie.ClickCount == 2:
+                    _currentWindow.Close();
+                    break;
+                case false when ie.ClickCount > 0:
+                    Point point = _iconPresenter.PointToScreen(_relativePoint);
+                    SystemCommands.ShowSystemMenu(_parentWindow as Window, point);
+                    Debug.WriteLine($"SYSMENU | Point.X = {point.X} Point.Y = {point.Y}");
+                    break;
+            }
+        };
     }
 
-    /// <summary>
-    /// Show 'SystemMenu' on mouse right button up.
-    /// </summary>
-    private void TitleBar_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
+    /// <inheritdoc />
+    protected override void OnInitialized(EventArgs e)
     {
-        Point point = PointToScreen(e.GetPosition(this));
-
-        if (dpiScale is null)
-        {
-            throw new InvalidOperationException("dpiScale is not initialized.");
-        }
-
-        SystemCommands.ShowSystemMenu(
-            _parentWindow as Window,
-            new Point(point.X / dpiScale.Value.DpiScaleX, point.Y / dpiScale.Value.DpiScaleY)
-        );
+        base.OnInitialized(e);
+        SetCurrentValue(ApplicationThemeProperty, ApplicationThemeManager.GetAppTheme());
+        ApplicationThemeManager.Changed += OnThemeChanged;
     }
 
-    private T GetTemplateChild<T>(string name)
-        where T : DependencyObject
+    /// <summary>
+    /// This virtual method is triggered when the app's theme changes.
+    /// </summary>
+    protected virtual void OnThemeChanged(ApplicationTheme currentApplicationTheme, Color systemAccent)
     {
-        DependencyObject element = GetTemplateChild(name);
-
-        if (element is not T tElement)
-        {
-            throw new InvalidOperationException(
-                $"Template part '{name}' is not found or is not of type {typeof(T)}"
-            );
-        }
-
-        return tElement;
+        Debug.WriteLine(
+            $"INFO | {typeof(TitleBar)} received theme -  {currentApplicationTheme}",
+            "Wpf.Ui.TitleBar"
+        );
+        SetCurrentValue(ApplicationThemeProperty, currentApplicationTheme);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml b/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
index 8af4ccca0..31dae5c27 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
+++ b/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
@@ -5,232 +5,241 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:markup="clr-namespace:Wpf.Ui.Markup"
+                    >
 
-    <Style TargetType="{x:Type controls:TitleBarButton}">
-        <Setter Property="Width" Value="44" />
-        <Setter Property="Height" Value="30" />
-        <Setter Property="MouseOverBackground" Value="{Binding Path=ButtonsBackground, RelativeSource={RelativeSource AncestorType={x:Type controls:TitleBar}}}" />
-        <Setter Property="ButtonsForeground" Value="{Binding Path=ButtonsForeground, RelativeSource={RelativeSource AncestorType={x:Type controls:TitleBar}}}" />
-        <Setter Property="MouseOverButtonsForeground" Value="{Binding Path=MouseOverButtonsForeground, RelativeSource={RelativeSource Self}}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Command" Value="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource AncestorType={x:Type controls:TitleBar}}}" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Canvas.ZIndex" Value="1" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:TitleBarButton}">
-                    <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}">
-                        <Viewbox
-                            x:Name="ViewBox"
-                            Width="11"
-                            Height="11"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Focusable="False"
-                            RenderOptions.BitmapScalingMode="HighQuality">
-                            <Canvas
-                                x:Name="Canvas"
-                                Width="72"
-                                Height="72"
-                                Focusable="False">
-                                <Path x:Name="CanvasPath" Fill="{TemplateBinding RenderButtonsForeground}" />
-                            </Canvas>
-                        </Viewbox>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Help}">
-                            <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Help}" />
-                            <Setter TargetName="ViewBox" Property="Width" Value="13" />
-                            <Setter TargetName="ViewBox" Property="Height" Value="13" />
-                            <Setter TargetName="Canvas" Property="Width" Value="24" />
-                            <Setter TargetName="Canvas" Property="Height" Value="41" />
-                            <Setter TargetName="CanvasPath" Property="Data" Value="M20.56,11.57c0-1.19-.24-2.31-.71-3.36-.47-1.05-1.11-1.96-1.92-2.74-.8-.78-1.74-1.4-2.81-1.85-1.07-.45-2.2-.68-3.37-.68s-2.37,.23-3.44,.69c-1.07,.46-2,1.09-2.8,1.88s-1.42,1.73-1.88,2.8c-.46,1.07-.69,2.22-.69,3.44,0,.4-.15,.74-.44,1.03s-.64,.44-1.03,.44c-.49,0-.86-.17-1.1-.52-.25-.34-.37-.74-.37-1.18,0-1.59,.32-3.09,.95-4.49,.63-1.4,1.49-2.62,2.57-3.66,1.08-1.04,2.33-1.86,3.74-2.47,1.42-.6,2.91-.91,4.49-.91s3.07,.3,4.49,.91c1.42,.6,2.66,1.43,3.74,2.47,1.08,1.04,1.93,2.26,2.57,3.66,.63,1.4,.95,2.9,.95,4.49,0,1.24-.13,2.32-.39,3.25-.26,.93-.63,1.77-1.12,2.54-.49,.77-1.08,1.49-1.78,2.18-.7,.69-1.48,1.42-2.35,2.2-.44,.4-.88,.78-1.31,1.16-.43,.38-.84,.78-1.24,1.21-.5,.55-.89,1.08-1.17,1.59-.28,.51-.48,1.03-.62,1.56-.14,.53-.22,1.09-.25,1.69-.03,.6-.05,1.25-.05,1.95,0,.4-.15,.74-.44,1.03-.29,.29-.64,.44-1.03,.44-.34,0-.6-.06-.79-.18-.19-.12-.34-.29-.44-.49-.1-.21-.17-.44-.2-.7-.03-.26-.05-.52-.05-.78v-.78c0-1.21,.15-2.28,.44-3.2,.29-.93,.68-1.76,1.16-2.5,.48-.74,1.03-1.41,1.65-2.02,.62-.6,1.25-1.19,1.89-1.74,.64-.56,1.27-1.11,1.88-1.66,.61-.55,1.16-1.15,1.64-1.8,.48-.65,.87-1.37,1.17-2.16,.3-.79,.45-1.69,.45-2.72Zm-11.02,27.36c0-.61,.21-1.13,.64-1.56,.43-.43,.95-.64,1.56-.64s1.13,.21,1.56,.64c.43,.43,.64,.95,.64,1.56s-.21,1.13-.64,1.56c-.43,.43-.95,.64-1.56,.64s-1.13-.21-1.56-.64c-.43-.43-.64-.95-.64-1.56Z" />
-                        </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Minimize}">
-                            <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Minimize}" />
-                            <Setter TargetName="Canvas" Property="Width" Value="72" />
-                            <Setter TargetName="Canvas" Property="Height" Value="8" />
-                            <Setter TargetName="CanvasPath" Property="Data" Value="M3.59,7.21A3.56,3.56,0,0,1,2.2,6.93a3.66,3.66,0,0,1-1.15-.78A3.88,3.88,0,0,1,.28,5,3.42,3.42,0,0,1,0,3.62,3.45,3.45,0,0,1,.28,2.23a4.12,4.12,0,0,1,.77-1.16A3.52,3.52,0,0,1,2.2.28,3.39,3.39,0,0,1,3.59,0H68.41A3.39,3.39,0,0,1,69.8.28,3.52,3.52,0,0,1,71,1.07a4.12,4.12,0,0,1,.77,1.16A3.45,3.45,0,0,1,72,3.62,3.42,3.42,0,0,1,71.72,5,3.88,3.88,0,0,1,71,6.15a3.66,3.66,0,0,1-1.15.78,3.56,3.56,0,0,1-1.39.28Z" />
-                        </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Restore}">
-                            <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Restore}" />
-                            <Setter TargetName="CanvasPath" Property="Data" Value="M10.62,72a9.92,9.92,0,0,1-4-.86A11.15,11.15,0,0,1,.86,65.43,9.92,9.92,0,0,1,0,61.38V25A9.86,9.86,0,0,1,.86,21,11.32,11.32,0,0,1,3.18,17.6a11,11,0,0,1,3.38-2.32,9.68,9.68,0,0,1,4.06-.87H47a9.84,9.84,0,0,1,4.08.87A11,11,0,0,1,56.72,21,9.84,9.84,0,0,1,57.59,25V61.38a9.68,9.68,0,0,1-.87,4.06,11,11,0,0,1-2.32,3.38A11.32,11.32,0,0,1,51,71.14,9.86,9.86,0,0,1,47,72Zm36.17-7.21a3.39,3.39,0,0,0,1.39-.28,3.79,3.79,0,0,0,1.16-.77,3.47,3.47,0,0,0,1.07-2.53v-36a3.55,3.55,0,0,0-.28-1.41,3.51,3.51,0,0,0-.77-1.16,3.67,3.67,0,0,0-1.16-.77,3.55,3.55,0,0,0-1.41-.28h-36a3.45,3.45,0,0,0-1.39.28,3.59,3.59,0,0,0-1.14.79,3.79,3.79,0,0,0-.77,1.16,3.39,3.39,0,0,0-.28,1.39v36a3.45,3.45,0,0,0,.28,1.39A3.62,3.62,0,0,0,9.4,64.51a3.45,3.45,0,0,0,1.39.28Zm18-43.45a13.14,13.14,0,0,0-1.16-5.5,14.41,14.41,0,0,0-3.14-4.5,15,15,0,0,0-4.61-3,14.14,14.14,0,0,0-5.5-1.1H15A10.73,10.73,0,0,1,21.88.51,10.93,10.93,0,0,1,25.21,0H50.38a20.82,20.82,0,0,1,8.4,1.71A21.72,21.72,0,0,1,70.29,13.18,20.91,20.91,0,0,1,72,21.59v25.2a10.93,10.93,0,0,1-.51,3.33A10.71,10.71,0,0,1,70,53.05a10.84,10.84,0,0,1-2.28,2.36,10.66,10.66,0,0,1-3,1.58Z" />
-                        </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Maximize}">
-                            <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Maximize}" />
-                            <Setter TargetName="CanvasPath" Property="Data" Value="M10.62,72a9.92,9.92,0,0,1-4-.86A11.15,11.15,0,0,1,.86,65.43,9.92,9.92,0,0,1,0,61.38V10.62a9.92,9.92,0,0,1,.86-4A11.15,11.15,0,0,1,6.57.86a9.92,9.92,0,0,1,4-.86H61.38a9.92,9.92,0,0,1,4.05.86,11.15,11.15,0,0,1,5.71,5.71,9.92,9.92,0,0,1,.86,4V61.38a9.92,9.92,0,0,1-.86,4.05,11.15,11.15,0,0,1-5.71,5.71,9.92,9.92,0,0,1-4.05.86Zm50.59-7.21a3.45,3.45,0,0,0,1.39-.28,3.62,3.62,0,0,0,1.91-1.91,3.45,3.45,0,0,0,.28-1.39V10.79a3.45,3.45,0,0,0-.28-1.39A3.62,3.62,0,0,0,62.6,7.49a3.45,3.45,0,0,0-1.39-.28H10.79a3.45,3.45,0,0,0-1.39.28A3.62,3.62,0,0,0,7.49,9.4a3.45,3.45,0,0,0-.28,1.39V61.21a3.45,3.45,0,0,0,.28,1.39A3.62,3.62,0,0,0,9.4,64.51a3.45,3.45,0,0,0,1.39.28Z" />
-                        </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Close}">
-                            <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Close}" />
-                            <Setter TargetName="CanvasPath" Property="Data" Value="M36,41.1,6.15,71a3.44,3.44,0,0,1-2.53,1A3.55,3.55,0,0,1,0,68.38a3.44,3.44,0,0,1,1.05-2.53L30.9,36,1.05,6.15A3.49,3.49,0,0,1,0,3.59,3.51,3.51,0,0,1,.28,2.18,3.42,3.42,0,0,1,1.05,1,3.82,3.82,0,0,1,2.21.28,3.58,3.58,0,0,1,3.62,0,3.44,3.44,0,0,1,6.15,1.05L36,30.9,65.85,1.05a3.49,3.49,0,0,1,2.56-1A3.39,3.39,0,0,1,69.8.28,3.8,3.8,0,0,1,71,1.05a3.8,3.8,0,0,1,.77,1.15A3.39,3.39,0,0,1,72,3.59a3.49,3.49,0,0,1-1,2.56L41.1,36,71,65.85a3.44,3.44,0,0,1,1,2.53,3.58,3.58,0,0,1-.28,1.41A3.82,3.82,0,0,1,71,71a3.42,3.42,0,0,1-1.14.77,3.66,3.66,0,0,1-4-.77Z" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+    <SolidColorBrush x:Key="MouseOverBrush"
+                     Color="#1A000000"
+                     />
+    <Color x:Key="ClosePressedBackgroundColor"
+           A="179"
+           R="244"
+           G="67"
+           B="54"
+           />
+    <SolidColorBrush x:Key="ClosePressedBackgroundBrush"
+                     Color="{StaticResource ClosePressedBackgroundColor}"
+                     />
 
     <Style TargetType="{x:Type controls:TitleBar}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
-        <Setter Property="ButtonsForeground" Value="{DynamicResource ButtonForeground}" />
-        <Setter Property="ButtonsBackground">
-            <Setter.Value>
-                <SolidColorBrush Color="#1A000000" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="Padding" Value="16,4,16,4" />
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="Height" Value="48" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}"/>
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="Padding" Value="16,4,16,4"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Height" Value="48"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:TitleBar}">
-                    <Grid
-                        x:Name="PART_MainGrid"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                        Background="{TemplateBinding Background}">
+                    <Grid x:Name="PART_MainGrid"
+                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          >
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
 
-                        <Grid
-                            x:Name="TitleGrid"
-                            Grid.Column="0"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Column="0"
+                                    Margin="{TemplateBinding Padding}"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Orientation="Horizontal"
+                                    >
 
                             <!--  Custom application icon  -->
-                            <ContentPresenter
-                                x:Name="PART_Icon"
-                                Grid.Column="0"
-                                Height="16"
-                                Margin="0,0,12,0"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding Icon}"
-                                Focusable="False"
-                                RenderOptions.BitmapScalingMode="HighQuality" />
+                            <ContentPresenter x:Name="PART_Icon"
+                                              Margin="0,0,12,0"
+                                              VerticalAlignment="Center"
+                                              Content="{TemplateBinding Icon}"
+                                              Focusable="False"
+                                              RenderOptions.BitmapScalingMode="HighQuality"
+                                              />
 
                             <!--  Main application title  -->
-                            <TextBlock
-                                Grid.Column="1"
-                                VerticalAlignment="Center"
-                                FontSize="{TemplateBinding FontSize}"
-                                Text="{TemplateBinding Title}" />
-                        </Grid>
-                        <Grid Grid.Column="1">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-
-                            <!--  Additional header content  -->
-                            <ContentPresenter
-                                Grid.Column="0"
-                                HorizontalAlignment="Right"
-                                Content="{TemplateBinding Header}" />
+                            <controls:TextBlock x:Name="PART_Title"
+                                                VerticalAlignment="Center"
+                                                FontSize="{TemplateBinding FontSize}"
+                                                Text="{TemplateBinding Title}"
+                                                />
 
-                            <!--  Navigation buttons - Close, Restore, Maximize, Minimize  -->
-                            <Grid
-                                Grid.Column="1"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Top">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
+                            <ContentPresenter x:Name="HeaderPresenter"
+                                              Height="{TemplateBinding ActualHeight}"
+                                              VerticalAlignment="Center"
+                                              Content="{TemplateBinding Header}"
+                                              />
 
-                                <controls:TitleBarButton
-                                    x:Name="PART_HelpButton"
-                                    Grid.Column="0"
-                                    ButtonType="Help" />
+                        </StackPanel>
 
-                                <controls:TitleBarButton
-                                    x:Name="PART_MinimizeButton"
-                                    Grid.Column="1"
-                                    ButtonType="Minimize" />
+                        <ContentPresenter x:Name="AdditionalControlsPresenter"
+                                          Grid.Column="1"
+                                          HorizontalAlignment="Right"
+                                          VerticalAlignment="Top"
+                                          Content="{TemplateBinding AdditionalControls}"
+                                          />
 
-                                <controls:TitleBarButton
-                                    x:Name="PART_MaximizeButton"
-                                    Grid.Column="2"
-                                    ButtonType="Maximize" />
+                        <!--  Navigation buttons - Close, Restore, Maximize, Minimize  -->
+                        <StackPanel Grid.Column="2"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Top"
+                                    Orientation="Horizontal"
+                                    >
+                            <!--  TODO: Add a style to remove code duplication.  -->
+                            <controls:Button x:Name="HelpButton"
+                                             Width="44"
+                                             Height="30"
+                                             Focusable="False"
+                                             SnapsToDevicePixels="True"
+                                             FocusVisualStyle="{DynamicResource DefaultControlFocusVisualStyle}"
+                                             IsTabStop="True"
+                                             Command="{Binding ButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                             CommandParameter="Help"
+                                             Foreground="{DynamicResource ButtonForeground}"
+                                             Background="Transparent"
+                                             BorderThickness="0"
+                                             CornerRadius="0"
+                                             Icon="{markup:FontIcon &#xF142;,
+                                                                    27,
+                                                                    FontFamily=Segoe Fluent Icons}"
+                                             />
+                            <controls:Button x:Name="MinimizeButton"
+                                             Width="44"
+                                             Height="30"
+                                             SnapsToDevicePixels="True"
+                                             Focusable="False"
+                                             FocusVisualStyle="{DynamicResource DefaultControlFocusVisualStyle}"
+                                             IsTabStop="True"
+                                             Command="{Binding ButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                             CommandParameter="Minimize"
+                                             Foreground="{DynamicResource ButtonForeground}"
+                                             Background="Transparent"
+                                             BorderThickness="0"
+                                             CornerRadius="0"
+                                             Icon="{markup:FontIcon &#xE921;,
+                                                                    11,
+                                                                    FontFamily=Segoe Fluent Icons}"
+                                             />
+                            <controls:Button x:Name="MaximizeButton"
+                                             Width="44"
+                                             Height="30"
+                                             Focusable="False"
+                                             SnapsToDevicePixels="True"
+                                             FocusVisualStyle="{DynamicResource DefaultControlFocusVisualStyle}"
+                                             IsTabStop="True"
+                                             Command="{Binding ButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                             CommandParameter="Maximize"
+                                             Foreground="{DynamicResource ButtonForeground}"
+                                             Background="Transparent"
+                                             BorderThickness="0"
+                                             CornerRadius="0"
+                                             >
+                                <controls:Button.Icon>
+                                    <controls:FontIcon x:Name="WindowStateIcon"
+                                                       FontSize="11"
+                                                       Glyph="&#xE922;"
+                                                       FontFamily="Segoe Fluent Icons"
+                                                       />
+                                </controls:Button.Icon>
+                            </controls:Button>
+                            <controls:Button x:Name="CloseButton"
+                                             Width="44"
+                                             Height="30"
+                                             SnapsToDevicePixels="True"
+                                             Focusable="False"
+                                             FocusVisualStyle="{DynamicResource DefaultControlFocusVisualStyle}"
+                                             IsTabStop="True"
+                                             Command="{Binding ButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                             CommandParameter="Close"
+                                             Foreground="{DynamicResource ButtonForeground}"
+                                             Background="Transparent"
+                                             BorderThickness="0"
+                                             CornerRadius="0"
+                                             PressedBackground="{StaticResource ClosePressedBackgroundBrush}"
+                                             MouseOverBackground="{DynamicResource PaletteRedBrush}"
+                                             Icon="{markup:FontIcon &#xE8BB;,
+                                                                    11,
+                                                                    FontFamily=Segoe Fluent Icons}"
+                                             />
+                        </StackPanel>
 
-                                <controls:TitleBarButton
-                                    x:Name="PART_CloseButton"
-                                    Grid.Column="4"
-                                    ButtonType="Close"
-                                    MouseOverButtonsForeground="White"
-                                    MouseOverBackground="{DynamicResource PaletteRedBrush}" />
-                            </Grid>
-                        </Grid>
                     </Grid>
                     <ControlTemplate.Triggers>
+                        <Trigger Property="Icon" Value="{x:Null}">
+                            <Setter TargetName="PART_Icon" Property="Visibility" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="Title" Value="{x:Null}">
+                            <Setter TargetName="PART_Title" Property="Visibility" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="ShowHelp" Value="False">
+                            <Setter TargetName="HelpButton" Property="Visibility" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="ShowMinimize" Value="False">
+                            <Setter TargetName="MinimizeButton" Property="Visibility" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="ShowMaximize" Value="False">
+                            <Setter TargetName="MaximizeButton" Property="Visibility" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="ShowClose" Value="False">
+                            <Setter TargetName="CloseButton" Property="Visibility" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="ShowHelp" Value="True">
+                            <Setter TargetName="HelpButton" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="ShowMinimize" Value="True">
+                            <Setter TargetName="MinimizeButton" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="ShowMaximize" Value="True">
+                            <Setter TargetName="MaximizeButton" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="ShowClose" Value="True">
+                            <Setter TargetName="CloseButton" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger SourceName="HelpButton" Property="IsMouseOver" Value="True">
+                            <Setter TargetName="HelpButton" Property="Background" Value="{StaticResource MouseOverBrush}"/>
+                        </Trigger>
+                        <Trigger SourceName="MinimizeButton" Property="IsMouseOver" Value="True">
+                            <Setter TargetName="MinimizeButton" Property="Background" Value="{StaticResource MouseOverBrush}"/>
+                        </Trigger>
+                        <Trigger SourceName="MaximizeButton" Property="IsMouseOver" Value="True">
+                            <Setter TargetName="MaximizeButton" Property="Background" Value="{StaticResource MouseOverBrush}"/>
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Icon" Value="{x:Null}" />
-                                <Condition Property="Title" Value="{x:Null}" />
+                                <Condition Property="ApplicationTheme" Value="Dark"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="TitleGrid" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="CloseButton" Property="Foreground" Value="White"/>
                         </MultiTrigger>
-                        <Trigger Property="ApplicationTheme" Value="Dark">
-                            <Setter Property="ButtonsBackground">
-                                <Setter.Value>
-                                    <SolidColorBrush Color="#17FFFFFF" />
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="PART_Icon" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="PART_Icon" Property="Margin" Value="0" />
-                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="ShowMaximize" Value="True" />
-                                <Condition Property="IsMaximized" Value="True" />
+                                <Condition Property="ApplicationTheme" Value="Light"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
                             </MultiTrigger.Conditions>
-
-                            <Setter TargetName="PART_MaximizeButton" Property="ButtonType" Value="Restore" />
+                            <Setter TargetName="CloseButton" Property="Foreground" Value="Black"/>
                         </MultiTrigger>
-                        <Trigger Property="ShowHelp" Value="False">
-                            <Setter TargetName="PART_HelpButton" Property="Visibility" Value="Collapsed" />
+                        <Trigger SourceName="CloseButton" Property="IsMouseOver" Value="True">
+                            <Setter TargetName="CloseButton" Property="Background" Value="{DynamicResource PaletteRedBrush}"/>
                         </Trigger>
-                        <Trigger Property="ShowMinimize" Value="False">
-                            <Setter TargetName="PART_MinimizeButton" Property="Visibility" Value="Collapsed" />
+                        <Trigger Property="IsMaximized" Value="True">
+                            <Setter TargetName="WindowStateIcon" Property="Glyph" Value="&#xE923;"/>
                         </Trigger>
-                        <Trigger Property="ShowMaximize" Value="False">
-                            <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                        <Trigger Property="ShowClose" Value="False">
-                            <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Collapsed" />
+                        <Trigger Property="IsMaximized" Value="False">
+                            <Setter TargetName="WindowStateIcon" Property="Glyph" Value="&#xE922;"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs b/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
deleted file mode 100644
index e87f3352f..000000000
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
-// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
-// All Rights Reserved.
-
-using System.Windows.Automation.Peers;
-using System.Windows.Automation.Provider;
-using Wpf.Ui.Extensions;
-using Wpf.Ui.Interop;
-
-// ReSharper disable once CheckNamespace
-namespace Wpf.Ui.Controls;
-
-public class TitleBarButton : Wpf.Ui.Controls.Button
-{
-    /// <summary>Identifies the <see cref="ButtonType"/> dependency property.</summary>
-    public static readonly DependencyProperty ButtonTypeProperty = DependencyProperty.Register(
-        nameof(ButtonType),
-        typeof(TitleBarButtonType),
-        typeof(TitleBarButton),
-        new PropertyMetadata(TitleBarButtonType.Unknown, OnButtonTypeChanged)
-    );
-
-    /// <summary>Identifies the <see cref="ButtonsForeground"/> dependency property.</summary>
-    public static readonly DependencyProperty ButtonsForegroundProperty = DependencyProperty.Register(
-        nameof(ButtonsForeground),
-        typeof(Brush),
-        typeof(TitleBarButton),
-        new FrameworkPropertyMetadata(
-            SystemColors.ControlTextBrush,
-            FrameworkPropertyMetadataOptions.Inherits
-        )
-    );
-
-    /// <summary>Identifies the <see cref="MouseOverButtonsForeground"/> dependency property.</summary>
-    public static readonly DependencyProperty MouseOverButtonsForegroundProperty =
-        DependencyProperty.Register(
-            nameof(MouseOverButtonsForeground),
-            typeof(Brush),
-            typeof(TitleBarButton),
-            new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.Inherits)
-        );
-
-    /// <summary>Identifies the <see cref="RenderButtonsForeground"/> dependency property.</summary>
-    public static readonly DependencyProperty RenderButtonsForegroundProperty = DependencyProperty.Register(
-        nameof(RenderButtonsForeground),
-        typeof(Brush),
-        typeof(TitleBarButton),
-        new FrameworkPropertyMetadata(
-            SystemColors.ControlTextBrush,
-            FrameworkPropertyMetadataOptions.Inherits
-        )
-    );
-
-    /// <summary>
-    /// Gets or sets the type of the button.
-    /// </summary>
-    public TitleBarButtonType ButtonType
-    {
-        get => (TitleBarButtonType)GetValue(ButtonTypeProperty);
-        set => SetValue(ButtonTypeProperty, value);
-    }
-
-    /// <summary>
-    /// Gets or sets the foreground of the navigation buttons.
-    /// </summary>
-    public Brush ButtonsForeground
-    {
-        get => (Brush)GetValue(ButtonsForegroundProperty);
-        set => SetValue(ButtonsForegroundProperty, value);
-    }
-
-    /// <summary>
-    /// Gets or sets the foreground of the navigation buttons when moused over.
-    /// </summary>
-    public Brush? MouseOverButtonsForeground
-    {
-        get => (Brush?)GetValue(MouseOverButtonsForegroundProperty);
-        set => SetValue(MouseOverButtonsForegroundProperty, value);
-    }
-
-    public Brush RenderButtonsForeground
-    {
-        get => (Brush)GetValue(RenderButtonsForegroundProperty);
-        set => SetValue(RenderButtonsForegroundProperty, value);
-    }
-
-    public bool IsHovered { get; private set; }
-
-    private readonly Brush _defaultBackgroundBrush = Brushes.Transparent; // REVIEW: Should it be transparent?
-    private User32.WM_NCHITTEST _returnValue;
-
-    private bool _isClickedDown;
-
-    public TitleBarButton()
-    {
-        Loaded += TitleBarButton_Loaded;
-        Unloaded += TitleBarButton_Unloaded;
-    }
-
-    private void TitleBarButton_Unloaded(object sender, RoutedEventArgs e)
-    {
-        DependencyPropertyDescriptor
-            .FromProperty(ButtonsForegroundProperty, typeof(Brush))
-            .RemoveValueChanged(this, OnButtonsForegroundChanged);
-    }
-
-    private void TitleBarButton_Loaded(object sender, RoutedEventArgs e)
-    {
-        SetCurrentValue(RenderButtonsForegroundProperty, ButtonsForeground);
-        DependencyPropertyDescriptor
-            .FromProperty(ButtonsForegroundProperty, typeof(Brush))
-            .AddValueChanged(this, OnButtonsForegroundChanged);
-    }
-
-    private void OnButtonsForegroundChanged(object? sender, EventArgs e)
-    {
-        SetCurrentValue(
-            RenderButtonsForegroundProperty,
-            IsHovered ? MouseOverButtonsForeground : ButtonsForeground
-        );
-    }
-
-    /// <summary>
-    /// Forces button background to change.
-    /// </summary>
-    public void Hover()
-    {
-        if (IsHovered)
-        {
-            return;
-        }
-
-        SetCurrentValue(BackgroundProperty, MouseOverBackground);
-        if (MouseOverButtonsForeground != null)
-        {
-            SetCurrentValue(RenderButtonsForegroundProperty, MouseOverButtonsForeground);
-        }
-
-        IsHovered = true;
-    }
-
-    /// <summary>
-    /// Forces button background to change.
-    /// </summary>
-    public void RemoveHover()
-    {
-        if (!IsHovered)
-        {
-            return;
-        }
-
-        SetCurrentValue(BackgroundProperty, _defaultBackgroundBrush);
-        SetCurrentValue(RenderButtonsForegroundProperty, ButtonsForeground);
-
-        IsHovered = false;
-        _isClickedDown = false;
-    }
-
-    /// <summary>
-    /// Invokes click on the button.
-    /// </summary>
-    public void InvokeClick()
-    {
-        if (
-            new ButtonAutomationPeer(this).GetPattern(PatternInterface.Invoke)
-            is IInvokeProvider invokeProvider
-        )
-        {
-            invokeProvider.Invoke();
-        }
-
-        _isClickedDown = false;
-    }
-
-    internal bool ReactToHwndHook(User32.WM msg, IntPtr lParam, out IntPtr returnIntPtr)
-    {
-        returnIntPtr = IntPtr.Zero;
-
-        switch (msg)
-        {
-            case User32.WM.NCHITTEST:
-                if (this.IsMouseOverElement(lParam))
-                {
-                    /*Debug.WriteLine($"Hitting {ButtonType} | return code {_returnValue}");*/
-                    Hover();
-                    returnIntPtr = (IntPtr)_returnValue;
-                    return true;
-                }
-
-                RemoveHover();
-                return false;
-            case User32.WM.NCMOUSELEAVE: // Mouse leaves the window
-                RemoveHover();
-                return false;
-            case User32.WM.NCLBUTTONDOWN when this.IsMouseOverElement(lParam): // Left button clicked down
-                _isClickedDown = true;
-                return true;
-            case User32.WM.NCLBUTTONUP when _isClickedDown && this.IsMouseOverElement(lParam): // Left button clicked up
-                InvokeClick();
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    private static void OnButtonTypeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is not TitleBarButton titleBarButton)
-        {
-            return;
-        }
-
-        titleBarButton.OnButtonTypeChanged(e);
-    }
-
-    protected void OnButtonTypeChanged(DependencyPropertyChangedEventArgs e)
-    {
-        var buttonType = (TitleBarButtonType)e.NewValue;
-
-        _returnValue = buttonType switch
-        {
-            TitleBarButtonType.Unknown => User32.WM_NCHITTEST.HTNOWHERE,
-            TitleBarButtonType.Help => User32.WM_NCHITTEST.HTHELP,
-            TitleBarButtonType.Minimize => User32.WM_NCHITTEST.HTMINBUTTON,
-            TitleBarButtonType.Close => User32.WM_NCHITTEST.HTCLOSE,
-            TitleBarButtonType.Restore => User32.WM_NCHITTEST.HTMAXBUTTON,
-            TitleBarButtonType.Maximize => User32.WM_NCHITTEST.HTMAXBUTTON,
-            _
-                => throw new ArgumentOutOfRangeException(
-                    "e.NewValue",
-                    buttonType,
-                    $"Unsupported button type: {buttonType}."
-                )
-        };
-    }
-}
diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBarButtonType.cs b/src/Wpf.Ui/Controls/TitleBar/TitleBarButtonType.cs
deleted file mode 100644
index da560e0d6..000000000
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBarButtonType.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
-// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
-// All Rights Reserved.
-
-// ReSharper disable once CheckNamespace
-namespace Wpf.Ui.Controls;
-
-/// <summary>
-/// Type of the Title Bar button.
-/// </summary>
-public enum TitleBarButtonType
-{
-    /// <summary>
-    /// Unknown button.
-    /// </summary>
-    Unknown,
-
-    /// <summary>
-    /// Maximize button.
-    /// </summary>
-    Minimize,
-
-    /// <summary>
-    /// Close button.
-    /// </summary>
-    Close,
-
-    /// <summary>
-    /// Maximize button.
-    /// </summary>
-    Maximize,
-
-    /// <summary>
-    /// Restore button.
-    /// </summary>
-    Restore,
-
-    /// <summary>
-    /// Help button.
-    /// </summary>
-    Help
-}
diff --git a/src/Wpf.Ui/Controls/ToggleButton/ToggleButton.xaml b/src/Wpf.Ui/Controls/ToggleButton/ToggleButton.xaml
index 04af06574..65d781c16 100644
--- a/src/Wpf.Ui/Controls/ToggleButton/ToggleButton.xaml
+++ b/src/Wpf.Ui/Controls/ToggleButton/ToggleButton.xaml
@@ -8,113 +8,117 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <Thickness x:Key="ToggleButtonPadding">11,5,11,6</Thickness>
     <Thickness x:Key="ToggleButtonBorderThemeThickness">1</Thickness>
     <Thickness x:Key="ToggleButtonIconMargin">0,0,8,0</Thickness>
 
-    <Style x:Key="DefaultToggleButtonStyle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="DefaultToggleButtonStyle"
+           TargetType="{x:Type ToggleButton}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource ToggleButtonBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource ToggleButtonPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource ToggleButtonBorderThemeThickness}"/>
+        <Setter Property="Padding" Value="{StaticResource ToggleButtonPadding}"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Border
-                        x:Name="ContentBorder"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        MinWidth="{TemplateBinding MinWidth}"
-                        MinHeight="{TemplateBinding MinHeight}"
-                        Padding="{TemplateBinding Padding}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding Border.CornerRadius}">
-                        <ContentPresenter
-                            x:Name="ContentPresenter"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding Content}"
-                            TextElement.FontSize="{TemplateBinding FontSize}"
-                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                    <Border x:Name="ContentBorder"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                            >
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Content="{TemplateBinding Content}"
+                                          TextElement.FontSize="{TemplateBinding FontSize}"
+                                          TextElement.Foreground="{TemplateBinding Foreground}"
+                                          />
                     </Border>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="False" />
-                                <Condition Property="IsChecked" Value="False" />
+                                <Condition Property="IsEnabled" Value="False"/>
+                                <Condition Property="IsChecked" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundDisabled}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ToggleButtonForegroundDisabled}" />
+                            <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundDisabled}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushDisabled}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ToggleButtonForegroundDisabled}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="False" />
-                                <Condition Property="IsChecked" Value="True" />
+                                <Condition Property="IsEnabled" Value="False"/>
+                                <Condition Property="IsChecked" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedDisabled}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedDisabled}" />
+                            <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedDisabled}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedDisabled}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedDisabled}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True" />
-                                <Condition Property="IsChecked" Value="True" />
+                                <Condition Property="IsEnabled" Value="True"/>
+                                <Condition Property="IsChecked" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundChecked}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource AccentControlElevationBorderBrush}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ToggleButtonForegroundChecked}" />
+                            <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundChecked}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource AccentControlElevationBorderBrush}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ToggleButtonForegroundChecked}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsChecked" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />
+                            <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsChecked" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource ToggleButtonForegroundCheckedPointerOver}" />
+                            <Setter Property="Background" Value="{DynamicResource ToggleButtonForegroundCheckedPointerOver}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsPressed" Value="True" />
-                                <Condition Property="IsChecked" Value="False" />
+                                <Condition Property="IsPressed" Value="True"/>
+                                <Condition Property="IsChecked" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPressed}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPressed}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ToggleButtonForegroundPressed}" />
+                            <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPressed}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPressed}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ToggleButtonForegroundPressed}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsPressed" Value="True" />
-                                <Condition Property="IsChecked" Value="True" />
+                                <Condition Property="IsPressed" Value="True"/>
+                                <Condition Property="IsChecked" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPressed}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPressed}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPressed}" />
+                            <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPressed}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPressed}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPressed}"/>
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -122,6 +126,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultToggleButtonStyle}" TargetType="{x:Type ToggleButton}" />
+    <Style BasedOn="{StaticResource DefaultToggleButtonStyle}"
+           TargetType="{x:Type ToggleButton}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ToggleSwitch/ToggleSwitch.xaml b/src/Wpf.Ui/Controls/ToggleSwitch/ToggleSwitch.xaml
index 5c397e420..5b7755379 100644
--- a/src/Wpf.Ui/Controls/ToggleSwitch/ToggleSwitch.xaml
+++ b/src/Wpf.Ui/Controls/ToggleSwitch/ToggleSwitch.xaml
@@ -8,11 +8,11 @@
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                    >
 
     <!--  TODO: Increase size on mouse over  -->
 
@@ -23,269 +23,271 @@
     <Thickness x:Key="ToggleSwitchBorderThemeThickness">1</Thickness>
     <Thickness x:Key="ToggleSwitchContentMargin">8,0,0,0</Thickness>
 
-    <Style x:Key="DefaultUiToggleSwitchStyle" TargetType="{x:Type controls:ToggleSwitch}">
+    <Style x:Key="DefaultUiToggleSwitchStyle"
+           TargetType="{x:Type controls:ToggleSwitch}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
-        <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForeground}" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="{StaticResource ToggleSwitchBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource ToggleSwitchPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOn}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForeground}"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="{StaticResource ToggleSwitchBorderThemeThickness}"/>
+        <Setter Property="Padding" Value="{StaticResource ToggleSwitchPadding}"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:ToggleSwitch}">
                     <Grid Background="Transparent">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
-                        <Grid
-                            Grid.Column="0"
-                            Width="{StaticResource ToggleButtonWidth}"
-                            Height="{StaticResource ToggleButtonHeight}">
-                            <Rectangle
-                                x:Name="ToggleRectangle"
-                                Width="{StaticResource ToggleButtonWidth}"
-                                Height="{StaticResource ToggleButtonHeight}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Fill="{DynamicResource ToggleSwitchFillOff}"
-                                RadiusX="10"
-                                RadiusY="10"
-                                Stroke="{DynamicResource ToggleSwitchStrokeOff}"
-                                StrokeThickness="1" />
-                            <Rectangle
-                                x:Name="ActiveToggleRectangle"
-                                Width="{StaticResource ToggleButtonWidth}"
-                                Height="{StaticResource ToggleButtonHeight}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="0.0"
-                                RadiusX="10"
-                                RadiusY="10"
-                                StrokeThickness="0" />
-                            <Ellipse
-                                x:Name="ToggleEllipse"
-                                Width="12"
-                                Height="12"
-                                Margin="0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Fill="{DynamicResource ToggleSwitchKnobFillOff}"
-                                RenderTransformOrigin="0.5, 0.5">
+                        <Grid Grid.Column="0"
+                              Width="{StaticResource ToggleButtonWidth}"
+                              Height="{StaticResource ToggleButtonHeight}"
+                              >
+                            <Rectangle x:Name="ToggleRectangle"
+                                       Width="{StaticResource ToggleButtonWidth}"
+                                       Height="{StaticResource ToggleButtonHeight}"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       Fill="{DynamicResource ToggleSwitchFillOff}"
+                                       RadiusX="10"
+                                       RadiusY="10"
+                                       Stroke="{DynamicResource ToggleSwitchStrokeOff}"
+                                       StrokeThickness="1"
+                                       />
+                            <Rectangle x:Name="ActiveToggleRectangle"
+                                       Width="{StaticResource ToggleButtonWidth}"
+                                       Height="{StaticResource ToggleButtonHeight}"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       Fill="{TemplateBinding Background}"
+                                       Opacity="0.0"
+                                       RadiusX="10"
+                                       RadiusY="10"
+                                       StrokeThickness="0"
+                                       />
+                            <Ellipse x:Name="ToggleEllipse"
+                                     Width="12"
+                                     Height="12"
+                                     Margin="0"
+                                     HorizontalAlignment="Center"
+                                     VerticalAlignment="Center"
+                                     Fill="{DynamicResource ToggleSwitchKnobFillOff}"
+                                     RenderTransformOrigin="0.5, 0.5"
+                                     >
                                 <Ellipse.RenderTransform>
-                                    <TranslateTransform X="-9" />
+                                    <TranslateTransform X="-9"/>
                                 </Ellipse.RenderTransform>
                             </Ellipse>
-                            <Ellipse
-                                x:Name="ActiveToggleEllipse"
-                                Width="12"
-                                Height="12"
-                                Margin="0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Fill="{DynamicResource ToggleSwitchKnobFillOn}"
-                                Opacity="0.0"
-                                RenderTransformOrigin="0.5, 0.5">
+                            <Ellipse x:Name="ActiveToggleEllipse"
+                                     Width="12"
+                                     Height="12"
+                                     Margin="0"
+                                     HorizontalAlignment="Center"
+                                     VerticalAlignment="Center"
+                                     Fill="{DynamicResource ToggleSwitchKnobFillOn}"
+                                     Opacity="0.0"
+                                     RenderTransformOrigin="0.5, 0.5"
+                                     >
                                 <Ellipse.RenderTransform>
-                                    <TranslateTransform X="-9" />
+                                    <TranslateTransform X="-9"/>
                                 </Ellipse.RenderTransform>
                             </Ellipse>
                         </Grid>
-                        <ContentPresenter
-                            x:Name="ContentPresenter"
-                            Grid.Column="1"
-                            Margin="{StaticResource ToggleSwitchContentMargin}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding Content}"
-                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          Grid.Column="1"
+                                          Margin="{StaticResource ToggleSwitchContentMargin}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Content="{TemplateBinding Content}"
+                                          TextElement.Foreground="{TemplateBinding Foreground}"
+                                          />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Content" Value="{x:Null}" />
-                                <Condition Property="OnContent" Value="{x:Null}" />
-                                <Condition Property="OffContent" Value="{x:Null}" />
+                                <Condition Property="Content" Value="{x:Null}"/>
+                                <Condition Property="OnContent" Value="{x:Null}"/>
+                                <Condition Property="OffContent" Value="{x:Null}"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0" />
+                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0"/>
                         </MultiTrigger>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Content" Value="" />
-                                <Condition Property="OnContent" Value="" />
-                                <Condition Property="OffContent" Value="" />
+                                <Condition Property="Content" Value=""/>
+                                <Condition Property="OnContent" Value=""/>
+                                <Condition Property="OffContent" Value=""/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0" />
+                            <Setter TargetName="ContentPresenter" Property="Margin" Value="0"/>
                         </MultiTrigger>
 
                         <Trigger Property="IsChecked" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ToggleRectangle"
-                                            Storyboard.TargetProperty="(Rectangle.Opacity)"
-                                            From="1.0"
-                                            To="0.0"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ActiveToggleRectangle"
-                                            Storyboard.TargetProperty="(Rectangle.Opacity)"
-                                            From="0.0"
-                                            To="1.0"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ToggleEllipse"
-                                            Storyboard.TargetProperty="(Ellipse.Opacity)"
-                                            From="1.0"
-                                            To="0.0"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ActiveToggleEllipse"
-                                            Storyboard.TargetProperty="(Ellipse.Opacity)"
-                                            From="0.0"
-                                            To="1.0"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ToggleEllipse"
-                                            Storyboard.TargetProperty="(Ellipse.RenderTransform).(TranslateTransform.X)"
-                                            From="-9"
-                                            To="9"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ActiveToggleEllipse"
-                                            Storyboard.TargetProperty="(Ellipse.RenderTransform).(TranslateTransform.X)"
-                                            From="-9"
-                                            To="9"
-                                            Duration="00:00:00.167" />
+                                        <DoubleAnimation Storyboard.TargetName="ToggleRectangle"
+                                                         Storyboard.TargetProperty="(Rectangle.Opacity)"
+                                                         From="1.0"
+                                                         To="0.0"
+                                                         Duration="00:00:00.167"
+                                                         />
+                                        <DoubleAnimation Storyboard.TargetName="ActiveToggleRectangle"
+                                                         Storyboard.TargetProperty="(Rectangle.Opacity)"
+                                                         From="0.0"
+                                                         To="1.0"
+                                                         Duration="00:00:00.167"
+                                                         />
+                                        <DoubleAnimation Storyboard.TargetName="ToggleEllipse"
+                                                         Storyboard.TargetProperty="(Ellipse.Opacity)"
+                                                         From="1.0"
+                                                         To="0.0"
+                                                         Duration="00:00:00.167"
+                                                         />
+                                        <DoubleAnimation Storyboard.TargetName="ActiveToggleEllipse"
+                                                         Storyboard.TargetProperty="(Ellipse.Opacity)"
+                                                         From="0.0"
+                                                         To="1.0"
+                                                         Duration="00:00:00.167"
+                                                         />
+                                        <DoubleAnimation Storyboard.TargetName="ToggleEllipse"
+                                                         Storyboard.TargetProperty="(Ellipse.RenderTransform).(TranslateTransform.X)"
+                                                         From="-9"
+                                                         To="9"
+                                                         Duration="00:00:00.167"
+                                                         />
+                                        <DoubleAnimation Storyboard.TargetName="ActiveToggleEllipse"
+                                                         Storyboard.TargetProperty="(Ellipse.RenderTransform).(TranslateTransform.X)"
+                                                         From="-9"
+                                                         To="9"
+                                                         Duration="00:00:00.167"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ToggleRectangle"
-                                            Storyboard.TargetProperty="(Rectangle.Opacity)"
-                                            From="0.0"
-                                            To="1.0"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ActiveToggleRectangle"
-                                            Storyboard.TargetProperty="(Rectangle.Opacity)"
-                                            From="1.0"
-                                            To="0.0"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ToggleEllipse"
-                                            Storyboard.TargetProperty="(Ellipse.Opacity)"
-                                            From="0.0"
-                                            To="1.0"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ActiveToggleEllipse"
-                                            Storyboard.TargetProperty="(Ellipse.Opacity)"
-                                            From="1.0"
-                                            To="0.0"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ToggleEllipse"
-                                            Storyboard.TargetProperty="(Ellipse.RenderTransform).(TranslateTransform.X)"
-                                            From="9"
-                                            To="-9"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ActiveToggleEllipse"
-                                            Storyboard.TargetProperty="(Ellipse.RenderTransform).(TranslateTransform.X)"
-                                            From="9"
-                                            To="-9"
-                                            Duration="00:00:00.167" />
+                                        <DoubleAnimation Storyboard.TargetName="ToggleRectangle"
+                                                         Storyboard.TargetProperty="(Rectangle.Opacity)"
+                                                         From="0.0"
+                                                         To="1.0"
+                                                         Duration="00:00:00.167"
+                                                         />
+                                        <DoubleAnimation Storyboard.TargetName="ActiveToggleRectangle"
+                                                         Storyboard.TargetProperty="(Rectangle.Opacity)"
+                                                         From="1.0"
+                                                         To="0.0"
+                                                         Duration="00:00:00.167"
+                                                         />
+                                        <DoubleAnimation Storyboard.TargetName="ToggleEllipse"
+                                                         Storyboard.TargetProperty="(Ellipse.Opacity)"
+                                                         From="0.0"
+                                                         To="1.0"
+                                                         Duration="00:00:00.167"
+                                                         />
+                                        <DoubleAnimation Storyboard.TargetName="ActiveToggleEllipse"
+                                                         Storyboard.TargetProperty="(Ellipse.Opacity)"
+                                                         From="1.0"
+                                                         To="0.0"
+                                                         Duration="00:00:00.167"
+                                                         />
+                                        <DoubleAnimation Storyboard.TargetName="ToggleEllipse"
+                                                         Storyboard.TargetProperty="(Ellipse.RenderTransform).(TranslateTransform.X)"
+                                                         From="9"
+                                                         To="-9"
+                                                         Duration="00:00:00.167"
+                                                         />
+                                        <DoubleAnimation Storyboard.TargetName="ActiveToggleEllipse"
+                                                         Storyboard.TargetProperty="(Ellipse.RenderTransform).(TranslateTransform.X)"
+                                                         From="9"
+                                                         To="-9"
+                                                         Duration="00:00:00.167"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Content" Value="{x:Null}" />
-                                <Condition Property="IsChecked" Value="True" />
+                                <Condition Property="Content" Value="{x:Null}"/>
+                                <Condition Property="IsChecked" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentPresenter" Property="Content" Value="{Binding OnContent, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="ContentPresenter" Property="Content" Value="{Binding OnContent, RelativeSource={RelativeSource TemplatedParent}}"/>
                         </MultiTrigger>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Content" Value="{x:Null}" />
-                                <Condition Property="IsChecked" Value="False" />
+                                <Condition Property="Content" Value="{x:Null}"/>
+                                <Condition Property="IsChecked" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentPresenter" Property="Content" Value="{Binding OffContent, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="ContentPresenter" Property="Content" Value="{Binding OffContent, RelativeSource={RelativeSource TemplatedParent}}"/>
                         </MultiTrigger>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Content" Value="" />
-                                <Condition Property="IsChecked" Value="True" />
+                                <Condition Property="Content" Value=""/>
+                                <Condition Property="IsChecked" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentPresenter" Property="Content" Value="{Binding OnContent, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="ContentPresenter" Property="Content" Value="{Binding OnContent, RelativeSource={RelativeSource TemplatedParent}}"/>
                         </MultiTrigger>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Content" Value="" />
-                                <Condition Property="IsChecked" Value="False" />
+                                <Condition Property="Content" Value=""/>
+                                <Condition Property="IsChecked" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentPresenter" Property="Content" Value="{Binding OffContent, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="ContentPresenter" Property="Content" Value="{Binding OffContent, RelativeSource={RelativeSource TemplatedParent}}"/>
                         </MultiTrigger>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsChecked" Value="False" />
-                                <Condition Property="IsEnabled" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="False"/>
+                                <Condition Property="IsEnabled" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ToggleRectangle" Property="Fill" Value="{DynamicResource ToggleSwitchFillOffPointerOver}" />
-                            <Setter TargetName="ToggleRectangle" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}" />
-                            <Setter TargetName="ToggleEllipse" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}" />
+                            <Setter TargetName="ToggleRectangle" Property="Fill" Value="{DynamicResource ToggleSwitchFillOffPointerOver}"/>
+                            <Setter TargetName="ToggleRectangle" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}"/>
+                            <Setter TargetName="ToggleEllipse" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsChecked" Value="True" />
-                                <Condition Property="IsEnabled" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True"/>
+                                <Condition Property="IsChecked" Value="True"/>
+                                <Condition Property="IsEnabled" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}" />
-                            <Setter TargetName="ToggleRectangle" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}" />
-                            <Setter TargetName="ActiveToggleEllipse" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}" />
+                            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}"/>
+                            <Setter TargetName="ToggleRectangle" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}"/>
+                            <Setter TargetName="ActiveToggleEllipse" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsChecked" Value="False" />
-                                <Condition Property="IsEnabled" Value="False" />
+                                <Condition Property="IsChecked" Value="False"/>
+                                <Condition Property="IsEnabled" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ToggleRectangle" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}" />
-                            <Setter TargetName="ToggleRectangle" Property="Fill" Value="{DynamicResource ToggleSwitchFillOffDisabled}" />
-                            <Setter TargetName="ToggleEllipse" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}" />
-                            <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForegroundDisabled}" />
+                            <Setter TargetName="ToggleRectangle" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}"/>
+                            <Setter TargetName="ToggleRectangle" Property="Fill" Value="{DynamicResource ToggleSwitchFillOffDisabled}"/>
+                            <Setter TargetName="ToggleEllipse" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForegroundDisabled}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsChecked" Value="True" />
-                                <Condition Property="IsEnabled" Value="False" />
+                                <Condition Property="IsChecked" Value="True"/>
+                                <Condition Property="IsEnabled" Value="False"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ActiveToggleRectangle" Property="Fill" Value="{DynamicResource ToggleSwitchFillOnDisabled}" />
-                            <Setter TargetName="ActiveToggleEllipse" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}" />
-                            <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForegroundDisabled}" />
+                            <Setter TargetName="ActiveToggleRectangle" Property="Fill" Value="{DynamicResource ToggleSwitchFillOnDisabled}"/>
+                            <Setter TargetName="ActiveToggleEllipse" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForegroundDisabled}"/>
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -293,6 +295,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultUiToggleSwitchStyle}" TargetType="{x:Type controls:ToggleSwitch}" />
+    <Style BasedOn="{StaticResource DefaultUiToggleSwitchStyle}"
+           TargetType="{x:Type controls:ToggleSwitch}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ToolBar/ToolBar.xaml b/src/Wpf.Ui/Controls/ToolBar/ToolBar.xaml
index 64de7c839..62d59fb6a 100644
--- a/src/Wpf.Ui/Controls/ToolBar/ToolBar.xaml
+++ b/src/Wpf.Ui/Controls/ToolBar/ToolBar.xaml
@@ -5,60 +5,64 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style x:Key="ToolBarButtonBaseStyle" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="ToolBarButtonBaseStyle"
+           TargetType="{x:Type ButtonBase}"
+           >
         <Setter Property="Background">
             <Setter.Value>
-                <SolidColorBrush Opacity="0.0" Color="{DynamicResource ControlFillColorDefault}" />
+                <SolidColorBrush Opacity="0.0"
+                                 Color="{DynamicResource ControlFillColorDefault}"
+                                 />
             </Setter.Value>
         </Setter>
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
-                    <Border
-                        x:Name="Border"
-                        Padding="12,6"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
-                        <ContentPresenter
-                            Margin="2"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            RecognizesAccessKey="True" />
+                    <Border x:Name="Border"
+                            Padding="12,6"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            >
+                        <ContentPresenter Margin="2"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          RecognizesAccessKey="True"
+                                          />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="Border"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="0.0"
-                                            To="1.0"
-                                            Duration="0:0:0.16" />
+                                        <DoubleAnimation Storyboard.TargetName="Border"
+                                                         Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
+                                                         From="0.0"
+                                                         To="1.0"
+                                                         Duration="0:0:0.16"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="Border"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="1.0"
-                                            To="0.0"
-                                            Duration="0:0:0.16" />
+                                        <DoubleAnimation Storyboard.TargetName="Border"
+                                                         Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
+                                                         From="1.0"
+                                                         To="0.0"
+                                                         Duration="0:0:0.16"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
@@ -69,64 +73,74 @@
         </Setter>
     </Style>
 
-    <Style
-        x:Key="{x:Static ToolBar.ButtonStyleKey}"
-        BasedOn="{StaticResource ToolBarButtonBaseStyle}"
-        TargetType="{x:Type Button}" />
-    <Style
-        x:Key="{x:Static ToolBar.ToggleButtonStyleKey}"
-        BasedOn="{StaticResource ToolBarButtonBaseStyle}"
-        TargetType="{x:Type ToggleButton}" />
-    <Style
-        x:Key="{x:Static ToolBar.CheckBoxStyleKey}"
-        BasedOn="{StaticResource ToolBarButtonBaseStyle}"
-        TargetType="{x:Type CheckBox}" />
-    <Style
-        x:Key="{x:Static ToolBar.RadioButtonStyleKey}"
-        BasedOn="{StaticResource ToolBarButtonBaseStyle}"
-        TargetType="{x:Type RadioButton}" />
+    <Style x:Key="{x:Static ToolBar.ButtonStyleKey}"
+           BasedOn="{StaticResource ToolBarButtonBaseStyle}"
+           TargetType="{x:Type Button}"
+           />
+    <Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}"
+           BasedOn="{StaticResource ToolBarButtonBaseStyle}"
+           TargetType="{x:Type ToggleButton}"
+           />
+    <Style x:Key="{x:Static ToolBar.CheckBoxStyleKey}"
+           BasedOn="{StaticResource ToolBarButtonBaseStyle}"
+           TargetType="{x:Type CheckBox}"
+           />
+    <Style x:Key="{x:Static ToolBar.RadioButtonStyleKey}"
+           BasedOn="{StaticResource ToolBarButtonBaseStyle}"
+           TargetType="{x:Type RadioButton}"
+           />
 
-    <Style x:Key="{x:Static ToolBar.TextBoxStyleKey}" TargetType="{x:Type TextBox}">
-        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="AllowDrop" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="{x:Static ToolBar.TextBoxStyleKey}"
+           TargetType="{x:Type TextBox}"
+           >
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="AllowDrop" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border
-                        x:Name="Border"
-                        Padding="2"
-                        Background="Transparent"
-                        BorderBrush="Transparent"
-                        BorderThickness="0">
-                        <controls:PassiveScrollViewer x:Name="PART_ContentHost" Margin="0" />
+                    <Border x:Name="Border"
+                            Padding="2"
+                            Background="Transparent"
+                            BorderBrush="Transparent"
+                            BorderThickness="0"
+                            >
+                        <controls:PassiveScrollViewer x:Name="PART_ContentHost"
+                                                      Margin="0"
+                                                      />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="ToolBarThumbStyle" TargetType="{x:Type Thumb}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Cursor" Value="SizeAll" />
+    <Style x:Key="ToolBarThumbStyle"
+           TargetType="{x:Type Thumb}"
+           >
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="Cursor" Value="SizeAll"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Background="Transparent" SnapsToDevicePixels="True">
+                    <Border Background="Transparent"
+                            SnapsToDevicePixels="True"
+                            >
                         <Rectangle Margin="0,2">
                             <Rectangle.Fill>
-                                <DrawingBrush
-                                    TileMode="Tile"
-                                    Viewbox="0,0,8,8"
-                                    ViewboxUnits="Absolute"
-                                    Viewport="0,0,4,4"
-                                    ViewportUnits="Absolute">
+                                <DrawingBrush TileMode="Tile"
+                                              Viewbox="0,0,8,8"
+                                              ViewboxUnits="Absolute"
+                                              Viewport="0,0,4,4"
+                                              ViewportUnits="Absolute"
+                                              >
                                     <DrawingBrush.Drawing>
                                         <DrawingGroup>
-                                            <GeometryDrawing Brush="#AAA" Geometry="M 4 4 L 4 8 L 8 8 L 8 4 z" />
+                                            <GeometryDrawing Brush="#AAA"
+                                                             Geometry="M 4 4 L 4 8 L 8 8 L 8 4 z"
+                                                             />
                                         </DrawingGroup>
                                     </DrawingBrush.Drawing>
                                 </DrawingBrush>
@@ -138,31 +152,33 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ToolBarOverflowButtonStyle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="ToolBarOverflowButtonStyle"
+           TargetType="{x:Type ToggleButton}"
+           >
         <Setter Property="Foreground">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorTertiary}" />
+                <SolidColorBrush Color="{DynamicResource TextFillColorTertiary}"/>
             </Setter.Value>
         </Setter>
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Border
-                        x:Name="Border"
-                        Background="{TemplateBinding Background}"
-                        CornerRadius="0,3,3,0"
-                        SnapsToDevicePixels="true">
+                    <Border x:Name="Border"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="0,3,3,0"
+                            SnapsToDevicePixels="true"
+                            >
                         <Grid>
-                            <controls:SymbolIcon
-                                Margin="0"
-                                VerticalAlignment="Bottom"
-                                Foreground="{TemplateBinding Foreground}"
-                                Symbol="ChevronDown20" />
-                            <ContentPresenter />
+                            <controls:SymbolIcon Margin="0"
+                                                 VerticalAlignment="Bottom"
+                                                 Foreground="{TemplateBinding Foreground}"
+                                                 Symbol="ChevronDown20"
+                                                 />
+                            <ContentPresenter/>
                         </Grid>
                         <!--
                         <VisualStateManager.VisualStateGroups>
@@ -196,7 +212,7 @@
                     <ControlTemplate.Triggers>
 
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Width" Value="0" />
+                            <Setter Property="Width" Value="0"/>
                         </Trigger>
 
                     </ControlTemplate.Triggers>
@@ -205,76 +221,78 @@
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Type ToolBar}" TargetType="{x:Type ToolBar}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="{x:Type ToolBar}"
+           TargetType="{x:Type ToolBar}"
+           >
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToolBar}">
-                    <Border
-                        x:Name="Border"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="4">
+                    <Border x:Name="Border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="4"
+                            >
                         <DockPanel>
-                            <ToggleButton
-                                ClickMode="Press"
-                                DockPanel.Dock="Right"
-                                IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                IsEnabled="{TemplateBinding HasOverflowItems}"
-                                Style="{StaticResource ToolBarOverflowButtonStyle}">
-                                <Popup
-                                    x:Name="OverflowPopup"
-                                    AllowsTransparency="True"
-                                    Focusable="False"
-                                    IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Placement="Bottom"
-                                    PopupAnimation="Slide"
-                                    StaysOpen="False">
-                                    <Border
-                                        x:Name="DropDownBorder"
-                                        Margin="12,0,12,18"
-                                        Padding="0,3,0,3"
-                                        BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
-                                        BorderThickness="1"
-                                        CornerRadius="8"
-                                        SnapsToDevicePixels="True">
+                            <ToggleButton ClickMode="Press"
+                                          DockPanel.Dock="Right"
+                                          IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                          IsEnabled="{TemplateBinding HasOverflowItems}"
+                                          Style="{StaticResource ToolBarOverflowButtonStyle}"
+                                          >
+                                <Popup x:Name="OverflowPopup"
+                                       AllowsTransparency="True"
+                                       Focusable="False"
+                                       IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                       Placement="Bottom"
+                                       PopupAnimation="Slide"
+                                       StaysOpen="False"
+                                       >
+                                    <Border x:Name="DropDownBorder"
+                                            Margin="12,0,12,18"
+                                            Padding="0,3,0,3"
+                                            BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
+                                            BorderThickness="1"
+                                            CornerRadius="8"
+                                            SnapsToDevicePixels="True"
+                                            >
                                         <Border.Background>
-                                            <SolidColorBrush Color="{DynamicResource SystemFillColorSolidNeutralBackground}" />
+                                            <SolidColorBrush Color="{DynamicResource SystemFillColorSolidNeutralBackground}"/>
                                         </Border.Background>
 
-                                        <ToolBarOverflowPanel
-                                            x:Name="PART_ToolBarOverflowPanel"
-                                            Margin="0"
-                                            FocusVisualStyle="{x:Null}"
-                                            Focusable="True"
-                                            KeyboardNavigation.DirectionalNavigation="Cycle"
-                                            KeyboardNavigation.TabNavigation="Cycle"
-                                            WrapWidth="200" />
+                                        <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel"
+                                                              Margin="0"
+                                                              FocusVisualStyle="{x:Null}"
+                                                              Focusable="True"
+                                                              KeyboardNavigation.DirectionalNavigation="Cycle"
+                                                              KeyboardNavigation.TabNavigation="Cycle"
+                                                              WrapWidth="200"
+                                                              />
                                     </Border>
                                 </Popup>
                             </ToggleButton>
 
-                            <Thumb
-                                x:Name="ToolBarThumb"
-                                Width="10"
-                                Style="{StaticResource ToolBarThumbStyle}" />
-                            <ToolBarPanel
-                                x:Name="PART_ToolBarPanel"
-                                Margin="0,1,2,2"
-                                IsItemsHost="True" />
+                            <Thumb x:Name="ToolBarThumb"
+                                   Width="10"
+                                   Style="{StaticResource ToolBarThumbStyle}"
+                                   />
+                            <ToolBarPanel x:Name="PART_ToolBarPanel"
+                                          Margin="0,1,2,2"
+                                          IsItemsHost="True"
+                                          />
                         </DockPanel>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsOverflowOpen" Value="true">
-                            <Setter TargetName="ToolBarThumb" Property="IsEnabled" Value="false" />
+                            <Setter TargetName="ToolBarThumb" Property="IsEnabled" Value="false"/>
                         </Trigger>
                         <Trigger Property="ToolBarTray.IsLocked" Value="true">
-                            <Setter TargetName="ToolBarThumb" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="ToolBarThumb" Property="Visibility" Value="Collapsed"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -282,13 +300,15 @@
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Type ToolBarTray}" TargetType="{x:Type ToolBarTray}">
+    <Style x:Key="{x:Type ToolBarTray}"
+           TargetType="{x:Type ToolBarTray}"
+           >
         <Setter Property="Background">
             <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
+                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}"/>
             </Setter.Value>
         </Setter>
-        <Setter Property="Margin" Value="0" />
+        <Setter Property="Margin" Value="0"/>
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/ToolTip/ToolTip.xaml b/src/Wpf.Ui/Controls/ToolTip/ToolTip.xaml
index bf9bd19e5..dbe6be937 100644
--- a/src/Wpf.Ui/Controls/ToolTip/ToolTip.xaml
+++ b/src/Wpf.Ui/Controls/ToolTip/ToolTip.xaml
@@ -5,49 +5,53 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
-    <Style x:Key="DefaultToolTipStyle" TargetType="{x:Type ToolTip}">
-        <Setter Property="MaxWidth" Value="260" />
-        <Setter Property="Height" Value="Auto" />
-        <Setter Property="Width" Value="Auto" />
-        <Setter Property="TextElement.FontSize" Value="12" />
-        <Setter Property="TextBlock.TextAlignment" Value="Justify" />
-        <Setter Property="TextElement.Foreground" Value="{DynamicResource ToolTipForeground}" />
-        <Setter Property="Foreground" Value="{DynamicResource ToolTipForeground}" />
-        <Setter Property="Background" Value="{DynamicResource ToolTipBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ToolTipBorderBrush}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Style x:Key="DefaultToolTipStyle"
+           TargetType="{x:Type ToolTip}"
+           >
+        <Setter Property="MaxWidth" Value="260"/>
+        <Setter Property="Height" Value="Auto"/>
+        <Setter Property="Width" Value="Auto"/>
+        <Setter Property="TextElement.FontSize" Value="12"/>
+        <Setter Property="TextBlock.TextAlignment" Value="Justify"/>
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource ToolTipForeground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ToolTipForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource ToolTipBackground}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ToolTipBorderBrush}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToolTip">
-                    <Border
-                        Name="Border"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        MaxWidth="{TemplateBinding MaxWidth}"
-                        Padding="8"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="1"
-                        CornerRadius="4"
-                        SnapsToDevicePixels="True">
+                    <Border Name="Border"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            MaxWidth="{TemplateBinding MaxWidth}"
+                            Padding="8"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="4"
+                            SnapsToDevicePixels="True"
+                            >
                         <Border.Effect>
-                            <DropShadowEffect
-                                BlurRadius="30"
-                                Direction="0"
-                                Opacity="0.4"
-                                ShadowDepth="0"
-                                Color="#202020" />
+                            <DropShadowEffect BlurRadius="30"
+                                              Direction="0"
+                                              Opacity="0.4"
+                                              ShadowDepth="0"
+                                              Color="#202020"
+                                              />
                         </Border.Effect>
-                        <ContentPresenter
-                            Margin="4"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top">
+                        <ContentPresenter Margin="4"
+                                          HorizontalAlignment="Left"
+                                          VerticalAlignment="Top"
+                                          >
                             <ContentPresenter.Resources>
                                 <Style TargetType="{x:Type TextBlock}">
-                                    <Setter Property="TextWrapping" Value="WrapWithOverflow" />
+                                    <Setter Property="TextWrapping" Value="WrapWithOverflow"/>
                                 </Style>
                             </ContentPresenter.Resources>
                         </ContentPresenter>
@@ -57,6 +61,8 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultToolTipStyle}" TargetType="{x:Type ToolTip}" />
+    <Style BasedOn="{StaticResource DefaultToolTipStyle}"
+           TargetType="{x:Type ToolTip}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/TreeGrid/TreeGrid.xaml b/src/Wpf.Ui/Controls/TreeGrid/TreeGrid.xaml
index f88cf4dd3..efa433a0a 100644
--- a/src/Wpf.Ui/Controls/TreeGrid/TreeGrid.xaml
+++ b/src/Wpf.Ui/Controls/TreeGrid/TreeGrid.xaml
@@ -5,33 +5,33 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
+                    >
 
     <Style TargetType="{x:Type controls:TreeGridItem}">
-        <Setter Property="Margin" Value="0" />
+        <Setter Property="Margin" Value="0"/>
     </Style>
 
     <Style TargetType="{x:Type controls:TreeGrid}">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
-        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
+        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
+        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <VirtualizingStackPanel
-                        IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
-                        Orientation="Vertical"
-                        VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}" />
+                    <VirtualizingStackPanel IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
+                                            Orientation="Vertical"
+                                            VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}"
+                                            />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
@@ -40,43 +40,53 @@
                 <ControlTemplate TargetType="{x:Type controls:TreeGrid}">
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
                         </Grid.RowDefinitions>
 
-                        <Border
-                            Grid.Row="0"
-                            Margin="0"
-                            BorderBrush="Red"
-                            BorderThickness="1">
+                        <Border Grid.Row="0"
+                                Margin="0"
+                                BorderBrush="Red"
+                                BorderThickness="1"
+                                >
                             <Grid>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition SharedSizeGroup="component" />
+                                    <ColumnDefinition SharedSizeGroup="component"/>
                                     <!--  Placeholders for two columns of ToggleButton  -->
-                                    <ColumnDefinition SharedSizeGroup="_toggle_group" />
-                                    <ColumnDefinition SharedSizeGroup="_toggle_group" />
+                                    <ColumnDefinition SharedSizeGroup="_toggle_group"/>
+                                    <ColumnDefinition SharedSizeGroup="_toggle_group"/>
 
-                                    <ColumnDefinition SharedSizeGroup="value" />
-                                    <ColumnDefinition SharedSizeGroup="min" />
-                                    <ColumnDefinition SharedSizeGroup="max" />
+                                    <ColumnDefinition SharedSizeGroup="value"/>
+                                    <ColumnDefinition SharedSizeGroup="min"/>
+                                    <ColumnDefinition SharedSizeGroup="max"/>
                                 </Grid.ColumnDefinitions>
-                                <TextBlock Grid.Column="0" Text="Component" />
+                                <TextBlock Grid.Column="0"
+                                           Text="Component"
+                                           />
                                 <!--  Empty TreeViewItem to measure the size of its ToggleButton into the "Toggle" group  -->
-                                <TreeViewItem Grid.Column="1" Padding="0" />
-                                <TextBlock Grid.Column="3" Text="Value" />
-                                <TextBlock Grid.Column="4" Text="Min" />
-                                <TextBlock Grid.Column="5" Text="Max" />
+                                <TreeViewItem Grid.Column="1"
+                                              Padding="0"
+                                              />
+                                <TextBlock Grid.Column="3"
+                                           Text="Value"
+                                           />
+                                <TextBlock Grid.Column="4"
+                                           Text="Min"
+                                           />
+                                <TextBlock Grid.Column="5"
+                                           Text="Max"
+                                           />
                             </Grid>
                         </Border>
 
                         <!--  Header above  -->
-                        <controls:PassiveScrollViewer
-                            Grid.Row="1"
-                            CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
-                            Focusable="False"
-                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+                        <controls:PassiveScrollViewer Grid.Row="1"
+                                                      CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                                                      Focusable="False"
+                                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                      >
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}"/>
                         </controls:PassiveScrollViewer>
                     </Grid>
                 </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/TreeView/TreeView.xaml b/src/Wpf.Ui/Controls/TreeView/TreeView.xaml
index 8fd85311e..fbd4b0006 100644
--- a/src/Wpf.Ui/Controls/TreeView/TreeView.xaml
+++ b/src/Wpf.Ui/Controls/TreeView/TreeView.xaml
@@ -5,45 +5,47 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
-    <Style x:Key="DefaultTreeViewStyle" TargetType="{x:Type TreeView}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Style x:Key="DefaultTreeViewStyle"
+           TargetType="{x:Type TreeView}"
+           >
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TreeView">
-                    <Border
-                        Name="Border"
-                        Padding="0"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="4">
-                        <controls:PassiveScrollViewer
-                            x:Name="ItemsPresenterScrollViewer"
-                            CanContentScroll="False"
-                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                            <ItemsPresenter Margin="{TemplateBinding Padding}" />
+                    <Border Name="Border"
+                            Padding="0"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="4"
+                            >
+                        <controls:PassiveScrollViewer x:Name="ItemsPresenterScrollViewer"
+                                                      CanContentScroll="False"
+                                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                      >
+                            <ItemsPresenter Margin="{TemplateBinding Padding}"/>
                         </controls:PassiveScrollViewer>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="VirtualizingPanel.IsVirtualizing" Value="True">
-                            <Setter TargetName="ItemsPresenterScrollViewer" Property="CanContentScroll" Value="True" />
+                            <Setter TargetName="ItemsPresenterScrollViewer" Property="CanContentScroll" Value="True"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -54,7 +56,7 @@
                 <Setter Property="ItemsPanel">
                     <Setter.Value>
                         <ItemsPanelTemplate>
-                            <VirtualizingStackPanel />
+                            <VirtualizingStackPanel/>
                         </ItemsPanelTemplate>
                     </Setter.Value>
                 </Setter>
@@ -62,6 +64,8 @@
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultTreeViewStyle}" TargetType="{x:Type TreeView}" />
+    <Style BasedOn="{StaticResource DefaultTreeViewStyle}"
+           TargetType="{x:Type TreeView}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/TreeView/TreeViewItem.xaml b/src/Wpf.Ui/Controls/TreeView/TreeViewItem.xaml
index 7a1fdb7f6..fda5303d3 100644
--- a/src/Wpf.Ui/Controls/TreeView/TreeViewItem.xaml
+++ b/src/Wpf.Ui/Controls/TreeView/TreeViewItem.xaml
@@ -5,61 +5,63 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                    >
 
     <system:Double x:Key="TreeViewItemChevronSize">10</system:Double>
     <system:Double x:Key="TreeViewItemFontSize">14</system:Double>
 
-    <Style x:Key="ExpandCollapseToggleButtonStyle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="ExpandCollapseToggleButtonStyle"
+           TargetType="{x:Type ToggleButton}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
-                    <Grid
-                        x:Name="ChevronContainer"
-                        Width="15"
-                        Height="15"
-                        Background="Transparent"
-                        RenderTransformOrigin="0.5, 0.5">
+                    <Grid x:Name="ChevronContainer"
+                          Width="15"
+                          Height="15"
+                          Background="Transparent"
+                          RenderTransformOrigin="0.5, 0.5"
+                          >
                         <Grid.RenderTransform>
-                            <RotateTransform Angle="0" />
+                            <RotateTransform Angle="0"/>
                         </Grid.RenderTransform>
-                        <controls:SymbolIcon
-                            x:Name="ChevronIcon"
-                            VerticalAlignment="Center"
-                            FontSize="{StaticResource TreeViewItemChevronSize}"
-                            Symbol="ChevronRight28" />
+                        <controls:SymbolIcon x:Name="ChevronIcon"
+                                             VerticalAlignment="Center"
+                                             FontSize="{StaticResource TreeViewItemChevronSize}"
+                                             Symbol="ChevronRight28"
+                                             />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ChevronContainer"
-                                            Storyboard.TargetProperty="(Grid.RenderTransform).(RotateTransform.Angle)"
-                                            To="90"
-                                            Duration="0:0:0.16" />
+                                        <DoubleAnimation Storyboard.TargetName="ChevronContainer"
+                                                         Storyboard.TargetProperty="(Grid.RenderTransform).(RotateTransform.Angle)"
+                                                         To="90"
+                                                         Duration="0:0:0.16"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
                                 <BeginStoryboard>
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ChevronContainer"
-                                            Storyboard.TargetProperty="(Grid.RenderTransform).(RotateTransform.Angle)"
-                                            To="0"
-                                            Duration="0:0:0.16" />
+                                        <DoubleAnimation Storyboard.TargetName="ChevronContainer"
+                                                         Storyboard.TargetProperty="(Grid.RenderTransform).(RotateTransform.Angle)"
+                                                         To="0"
+                                                         Duration="0:0:0.16"
+                                                         />
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
@@ -70,104 +72,110 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultTreeViewItemStyle" TargetType="{x:Type TreeViewItem}">
+    <Style x:Key="DefaultTreeViewItemStyle"
+           TargetType="{x:Type TreeViewItem}"
+           >
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}"/>
         <!--  Universal WPF UI focus  -->
-        <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}" />
-        <Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
-        <Setter Property="Padding" Value="4" />
-        <Setter Property="FontSize" Value="{StaticResource TreeViewItemFontSize}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="IsTabStop" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}"/>
+        <Setter Property="Padding" Value="4"/>
+        <Setter Property="FontSize" Value="{StaticResource TreeViewItemFontSize}"/>
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
+        <Setter Property="IsTabStop" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TreeViewItem}">
                     <Grid Background="{TemplateBinding Background}">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <Border
-                            x:Name="Border"
-                            Grid.Row="0"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}">
+                        <Border x:Name="Border"
+                                Grid.Row="0"
+                                CornerRadius="{TemplateBinding Border.CornerRadius}"
+                                >
                             <Grid>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" MinWidth="19" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto"
+                                                      MinWidth="19"
+                                                      />
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
                                 </Grid.ColumnDefinitions>
-                                <Rectangle
-                                    x:Name="ActiveRectangle"
-                                    Grid.Column="0"
-                                    Width="3"
-                                    Height="16"
-                                    Margin="0,0,0,0"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    Fill="{DynamicResource TreeViewItemSelectionIndicatorForeground}"
-                                    RadiusX="2"
-                                    RadiusY="2"
-                                    Visibility="Collapsed" />
-                                <ToggleButton
-                                    x:Name="Expander"
-                                    Grid.Column="0"
-                                    Margin="8,0"
-                                    ClickMode="Press"
-                                    IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Style="{StaticResource ExpandCollapseToggleButtonStyle}" />
-                                <ContentPresenter
-                                    x:Name="PART_Header"
-                                    Grid.Column="1"
-                                    Margin="{TemplateBinding Padding}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    ContentSource="Header"
-                                    TextElement.FontSize="{TemplateBinding FontSize}" />
+                                <Rectangle x:Name="ActiveRectangle"
+                                           Grid.Column="0"
+                                           Width="3"
+                                           Height="16"
+                                           Margin="0,0,0,0"
+                                           HorizontalAlignment="Left"
+                                           VerticalAlignment="Center"
+                                           Fill="{DynamicResource TreeViewItemSelectionIndicatorForeground}"
+                                           RadiusX="2"
+                                           RadiusY="2"
+                                           Visibility="Collapsed"
+                                           />
+                                <ToggleButton x:Name="Expander"
+                                              Grid.Column="0"
+                                              Margin="8,0"
+                                              ClickMode="Press"
+                                              IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                                              Style="{StaticResource ExpandCollapseToggleButtonStyle}"
+                                              />
+                                <ContentPresenter x:Name="PART_Header"
+                                                  Grid.Column="1"
+                                                  Margin="{TemplateBinding Padding}"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  ContentSource="Header"
+                                                  TextElement.FontSize="{TemplateBinding FontSize}"
+                                                  />
                             </Grid>
                         </Border>
                         <Grid Grid.Row="1">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" MinWidth="19" />
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto"
+                                                  MinWidth="19"
+                                                  />
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
-                            <ItemsPresenter
-                                x:Name="ItemsHost"
-                                Grid.Column="1"
-                                Grid.ColumnSpan="2"
-                                Visibility="Collapsed" />
+                            <ItemsPresenter x:Name="ItemsHost"
+                                            Grid.Column="1"
+                                            Grid.ColumnSpan="2"
+                                            Visibility="Collapsed"
+                                            />
                         </Grid>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="HasItems" Value="False">
-                            <Setter TargetName="Expander" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="Expander" Property="Visibility" Value="Hidden"/>
                         </Trigger>
                         <Trigger Property="IsExpanded" Value="True">
-                            <Setter TargetName="ItemsHost" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="ItemsHost" Property="Visibility" Value="Visible"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource TreeViewItemBackgroundPointerOver}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource TreeViewItemBackgroundPointerOver}"/>
                         </Trigger>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelected}" />
-                            <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelected}"/>
+                            <Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="HasHeader" Value="False" />
-                                <Condition Property="Width" Value="Auto" />
+                                <Condition Property="HasHeader" Value="False"/>
+                                <Condition Property="Width" Value="Auto"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_Header" Property="MinWidth" Value="75" />
+                            <Setter TargetName="PART_Header" Property="MinWidth" Value="75"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="HasHeader" Value="False" />
-                                <Condition Property="Height" Value="Auto" />
+                                <Condition Property="HasHeader" Value="False"/>
+                                <Condition Property="Height" Value="Auto"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_Header" Property="MinHeight" Value="19" />
+                            <Setter TargetName="PART_Header" Property="MinHeight" Value="19"/>
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -178,7 +186,7 @@
                 <Setter Property="ItemsPanel">
                     <Setter.Value>
                         <ItemsPanelTemplate>
-                            <VirtualizingStackPanel />
+                            <VirtualizingStackPanel/>
                         </ItemsPanelTemplate>
                     </Setter.Value>
                 </Setter>
@@ -186,69 +194,73 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="DefaultUiTreeViewItemStyle" TargetType="{x:Type controls:TreeViewItem}">
-        <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}" />
-        <Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
-        <Setter Property="Padding" Value="4" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource TreeViewItemFocusVisual}" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Style x:Key="DefaultUiTreeViewItemStyle"
+           TargetType="{x:Type controls:TreeViewItem}"
+           >
+        <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}"/>
+        <Setter Property="Padding" Value="4"/>
+        <Setter Property="FocusVisualStyle" Value="{StaticResource TreeViewItemFocusVisual}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:TreeViewItem}">
                     <Grid Background="{TemplateBinding Background}">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition />
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition/>
                         </Grid.RowDefinitions>
-                        <ToggleButton
-                            x:Name="Expander"
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            ClickMode="Press"
-                            IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                            Style="{StaticResource ExpandCollapseToggleButtonStyle}" />
-                        <Border
-                            x:Name="Bd"
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            Padding="{TemplateBinding Padding}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <ToggleButton x:Name="Expander"
+                                      Grid.Row="0"
+                                      Grid.Column="0"
+                                      ClickMode="Press"
+                                      IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource ExpandCollapseToggleButtonStyle}"
+                                      />
+                        <Border x:Name="Bd"
+                                Grid.Row="0"
+                                Grid.Column="1"
+                                Padding="{TemplateBinding Padding}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                >
                             <Border.Background>
-                                <SolidColorBrush Opacity="0.0" Color="{DynamicResource SystemAccentColor}" />
+                                <SolidColorBrush Opacity="0.0"
+                                                 Color="{DynamicResource SystemAccentColor}"
+                                                 />
                             </Border.Background>
                             <Grid>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
                                 </Grid.ColumnDefinitions>
 
-                                <ContentPresenter
-                                    x:Name="SymbolIcon"
-                                    Grid.Column="0"
-                                    Margin="0,0,8,0"
-                                    Content="{TemplateBinding Icon}"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                                <ContentPresenter x:Name="SymbolIcon"
+                                                  Grid.Column="0"
+                                                  Margin="0,0,8,0"
+                                                  Content="{TemplateBinding Icon}"
+                                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                                  />
 
-                                <ContentPresenter
-                                    x:Name="PART_Header"
-                                    Grid.Column="1"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    ContentSource="Header" />
+                                <ContentPresenter x:Name="PART_Header"
+                                                  Grid.Column="1"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  ContentSource="Header"
+                                                  />
                             </Grid>
                         </Border>
-                        <ItemsPresenter
-                            x:Name="ItemsHost"
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            Grid.ColumnSpan="2"
-                            Visibility="Collapsed" />
+                        <ItemsPresenter x:Name="ItemsHost"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Grid.ColumnSpan="2"
+                                        Visibility="Collapsed"
+                                        />
                         <VisualStateManager.VisualStateGroups>
                             <!--
                             <VisualStateGroup Name="CommonStates">
@@ -272,57 +284,61 @@
                             <VisualStateGroup x:Name="SelectionStates">
                                 <VisualState x:Name="Selected">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Opacity)"
-                                            From="0.0"
-                                            To="1.0"
-                                            Duration="0:0:.16" />
+                                        <DoubleAnimation Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Opacity)"
+                                                         From="0.0"
+                                                         To="1.0"
+                                                         Duration="0:0:.16"
+                                                         />
                                     </Storyboard>
                                 </VisualState>
-                                <VisualState x:Name="Unselected" />
+                                <VisualState x:Name="Unselected"/>
                                 <VisualState x:Name="SelectedInactive">
                                     <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Opacity)"
-                                            From="0.0"
-                                            To="1.0"
-                                            Duration="0:0:.16" />
+                                        <DoubleAnimation Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Opacity)"
+                                                         From="0.0"
+                                                         To="1.0"
+                                                         Duration="0:0:.16"
+                                                         />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
                             <VisualStateGroup x:Name="ExpansionStates">
                                 <VisualState x:Name="Expanded">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost"
+                                                                       Storyboard.TargetProperty="(UIElement.Visibility)"
+                                                                       >
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{x:Static Visibility.Visible}"
+                                                                    />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
-                                <VisualState x:Name="Collapsed" />
+                                <VisualState x:Name="Collapsed"/>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="SymbolIcon" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="SymbolIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="SymbolIcon" Property="Visibility" Value="Collapsed"/>
+                            <Setter TargetName="SymbolIcon" Property="Margin" Value="0"/>
                         </Trigger>
                         <Trigger Property="HasItems" Value="False">
-                            <Setter TargetName="Expander" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="Expander" Property="Visibility" Value="Hidden"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="HasHeader" Value="False" />
-                                <Condition Property="Width" Value="Auto" />
+                                <Condition Property="HasHeader" Value="False"/>
+                                <Condition Property="Width" Value="Auto"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_Header" Property="MinWidth" Value="75" />
+                            <Setter TargetName="PART_Header" Property="MinWidth" Value="75"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="HasHeader" Value="False" />
-                                <Condition Property="Height" Value="Auto" />
+                                <Condition Property="HasHeader" Value="False"/>
+                                <Condition Property="Height" Value="Auto"/>
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_Header" Property="MinHeight" Value="19" />
+                            <Setter TargetName="PART_Header" Property="MinHeight" Value="19"/>
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -333,7 +349,7 @@
                 <Setter Property="ItemsPanel">
                     <Setter.Value>
                         <ItemsPanelTemplate>
-                            <VirtualizingStackPanel />
+                            <VirtualizingStackPanel/>
                         </ItemsPanelTemplate>
                     </Setter.Value>
                 </Setter>
@@ -341,7 +357,11 @@
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource DefaultTreeViewItemStyle}" TargetType="{x:Type TreeViewItem}" />
-    <Style BasedOn="{StaticResource DefaultUiTreeViewItemStyle}" TargetType="{x:Type controls:TreeViewItem}" />
+    <Style BasedOn="{StaticResource DefaultTreeViewItemStyle}"
+           TargetType="{x:Type TreeViewItem}"
+           />
+    <Style BasedOn="{StaticResource DefaultUiTreeViewItemStyle}"
+           TargetType="{x:Type controls:TreeViewItem}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/VirtualizingGridView/VirtualizingGridView.xaml b/src/Wpf.Ui/Controls/VirtualizingGridView/VirtualizingGridView.xaml
index a59739b41..ec735e3cb 100644
--- a/src/Wpf.Ui/Controls/VirtualizingGridView/VirtualizingGridView.xaml
+++ b/src/Wpf.Ui/Controls/VirtualizingGridView/VirtualizingGridView.xaml
@@ -5,29 +5,29 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Style TargetType="{x:Type controls:VirtualizingGridView}">
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
-        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
+        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <controls:VirtualizingWrapPanel
-                        IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
-                        Orientation="Vertical"
-                        SpacingMode="StartAndEndOnly"
-                        StretchItems="False"
-                        VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}" />
+                    <controls:VirtualizingWrapPanel IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
+                                                    Orientation="Vertical"
+                                                    SpacingMode="StartAndEndOnly"
+                                                    StretchItems="False"
+                                                    VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}"
+                                                    />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
@@ -36,28 +36,28 @@
                 <ControlTemplate TargetType="{x:Type controls:VirtualizingGridView}">
                     <Grid>
                         <controls:PassiveScrollViewer x:Name="PART_ContentHost">
-                            <ItemsPresenter />
+                            <ItemsPresenter/>
                         </controls:PassiveScrollViewer>
-                        <Rectangle
-                            x:Name="PART_DisabledVisual"
-                            Opacity="0"
-                            RadiusX="2"
-                            RadiusY="2"
-                            Stretch="Fill"
-                            Stroke="Transparent"
-                            StrokeThickness="0"
-                            Visibility="Collapsed">
+                        <Rectangle x:Name="PART_DisabledVisual"
+                                   Opacity="0"
+                                   RadiusX="2"
+                                   RadiusY="2"
+                                   Stretch="Fill"
+                                   Stroke="Transparent"
+                                   StrokeThickness="0"
+                                   Visibility="Collapsed"
+                                   >
                             <Rectangle.Fill>
-                                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
+                                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}"/>
                             </Rectangle.Fill>
                         </Rectangle>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsGrouping" Value="True">
-                            <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_DisabledVisual" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_DisabledVisual" Property="Visibility" Value="Visible"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/Wpf.Ui/Controls/VirtualizingItemsControl/VirtualizingItemsControl.xaml b/src/Wpf.Ui/Controls/VirtualizingItemsControl/VirtualizingItemsControl.xaml
index 440e1991d..af395b473 100644
--- a/src/Wpf.Ui/Controls/VirtualizingItemsControl/VirtualizingItemsControl.xaml
+++ b/src/Wpf.Ui/Controls/VirtualizingItemsControl/VirtualizingItemsControl.xaml
@@ -5,42 +5,42 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Style TargetType="{x:Type controls:VirtualizingItemsControl}">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
-        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
+        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
+        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <controls:VirtualizingWrapPanel
-                        IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
-                        Orientation="Vertical"
-                        SpacingMode="StartAndEndOnly"
-                        StretchItems="False"
-                        VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}" />
+                    <controls:VirtualizingWrapPanel IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
+                                                    Orientation="Vertical"
+                                                    SpacingMode="StartAndEndOnly"
+                                                    StretchItems="False"
+                                                    VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}"
+                                                    />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:VirtualizingItemsControl}">
-                    <controls:PassiveScrollViewer
-                        CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
-                        Focusable="False"
-                        HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                        <ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+                    <controls:PassiveScrollViewer CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                                                  Focusable="False"
+                                                  HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                  VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                  >
+                        <ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}"/>
                     </controls:PassiveScrollViewer>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/Wpf.Ui/Controls/VirtualizingWrapPanel/VirtualizingWrapPanel.xaml b/src/Wpf.Ui/Controls/VirtualizingWrapPanel/VirtualizingWrapPanel.xaml
index 680cdcf17..c04108d19 100644
--- a/src/Wpf.Ui/Controls/VirtualizingWrapPanel/VirtualizingWrapPanel.xaml
+++ b/src/Wpf.Ui/Controls/VirtualizingWrapPanel/VirtualizingWrapPanel.xaml
@@ -5,18 +5,18 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <Style TargetType="{x:Type controls:VirtualizingWrapPanel}">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Controls/Window/Window.xaml b/src/Wpf.Ui/Controls/Window/Window.xaml
index a4493d605..23149f063 100644
--- a/src/Wpf.Ui/Controls/Window/Window.xaml
+++ b/src/Wpf.Ui/Controls/Window/Window.xaml
@@ -5,51 +5,53 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    >
 
     <!--
         SingleBorderWindow preserves the animations and scaling properly.
         By default, the navigation buttons will be hidden by the background.
         If we use Mica, we hide them manually.
     -->
-    <Style x:Key="DefaultWindowStyle" TargetType="{x:Type Window}">
-        <Setter Property="Background" Value="{DynamicResource WindowBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource WindowForeground}" />
-        <Setter Property="Height" Value="600" />
-        <Setter Property="MinHeight" Value="320" />
-        <Setter Property="Width" Value="1100" />
-        <Setter Property="MinWidth" Value="460" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="WindowStyle" Value="SingleBorderWindow" />
-        <Setter Property="AllowsTransparency" Value="False" />
-        <Setter Property="ResizeMode" Value="CanResize" />
+    <Style x:Key="DefaultWindowStyle"
+           TargetType="{x:Type Window}"
+           >
+        <Setter Property="Background" Value="{DynamicResource WindowBackground}"/>
+        <Setter Property="Foreground" Value="{DynamicResource WindowForeground}"/>
+        <Setter Property="Height" Value="600"/>
+        <Setter Property="MinHeight" Value="320"/>
+        <Setter Property="Width" Value="1100"/>
+        <Setter Property="MinWidth" Value="460"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="WindowStyle" Value="SingleBorderWindow"/>
+        <Setter Property="AllowsTransparency" Value="False"/>
+        <Setter Property="ResizeMode" Value="CanResize"/>
         <!--  The Display option casues a large aliasing effect  -->
         <!-- <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" /> -->
         <!--  I don't know if this is always the case, but ClearType blurs the fonts a bit for me  -->
         <!--<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />-->
-        <Setter Property="RenderOptions.BitmapScalingMode" Value="Linear" />
+        <Setter Property="RenderOptions.BitmapScalingMode" Value="Linear"/>
         <!--  Aliased breaks rounded control elements such as buttons  -->
-        <Setter Property="RenderOptions.EdgeMode" Value="Unspecified" />
-        <Setter Property="UseLayoutRounding" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="RenderOptions.EdgeMode" Value="Unspecified"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Window}">
                     <AdornerDecorator>
-                        <controls:ClientAreaBorder
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                            <ContentPresenter x:Name="ContentPresenter" />
+                        <controls:ClientAreaBorder Background="{TemplateBinding Background}"
+                                                   BorderBrush="{TemplateBinding BorderBrush}"
+                                                   BorderThickness="{TemplateBinding BorderThickness}"
+                                                   >
+                            <ContentPresenter x:Name="ContentPresenter"/>
                         </controls:ClientAreaBorder>
                     </AdornerDecorator>
                 </ControlTemplate>
@@ -57,16 +59,18 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="WindowState" Value="Normal">
-                <Setter Property="ResizeMode" Value="CanResize" />
+                <Setter Property="ResizeMode" Value="CanResize"/>
             </Trigger>
             <Trigger Property="WindowState" Value="Maximized">
-                <Setter Property="ResizeMode" Value="NoResize" />
-                <Setter Property="Topmost" Value="False" />
+                <Setter Property="ResizeMode" Value="NoResize"/>
+                <Setter Property="Topmost" Value="False"/>
             </Trigger>
         </Style.Triggers>
     </Style>
 
 
-    <Style BasedOn="{StaticResource DefaultWindowStyle}" TargetType="{x:Type Window}" />
+    <Style BasedOn="{StaticResource DefaultWindowStyle}"
+           TargetType="{x:Type Window}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Resources/Accent.xaml b/src/Wpf.Ui/Resources/Accent.xaml
index 1cd063de3..7067402c9 100644
--- a/src/Wpf.Ui/Resources/Accent.xaml
+++ b/src/Wpf.Ui/Resources/Accent.xaml
@@ -5,7 +5,9 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <!--  Colors depending on the theme should be changed by the Manager  -->
     <Color x:Key="SystemAccentColor">#3379d9</Color>
@@ -19,29 +21,51 @@
     <!--  SystemAccentColorDark3 | SystemAccentColorLight3  -->
     <Color x:Key="SystemAccentColorTertiary">#add8ff</Color>
 
-    <SolidColorBrush x:Key="SystemAccentColorBrush" Color="{StaticResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemAccentColorBrush"
+                     Color="{StaticResource SystemAccentColor}"
+                     />
 
-    <SolidColorBrush x:Key="SystemAccentColorPrimaryBrush" Color="{StaticResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="SystemAccentColorSecondaryBrush" Color="{StaticResource SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="SystemAccentColorTertiaryBrush" Color="{StaticResource SystemAccentColorTertiary}" />
+    <SolidColorBrush x:Key="SystemAccentColorPrimaryBrush"
+                     Color="{StaticResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="SystemAccentColorSecondaryBrush"
+                     Color="{StaticResource SystemAccentColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="SystemAccentColorTertiaryBrush"
+                     Color="{StaticResource SystemAccentColorTertiary}"
+                     />
 
-    <SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{StaticResource SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{StaticResource SystemAccentColorTertiary}" />
-    <SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{StaticResource SystemAccentColorPrimary}" />
+    <SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush"
+                     Color="{StaticResource SystemAccentColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush"
+                     Color="{StaticResource SystemAccentColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush"
+                     Color="{StaticResource SystemAccentColorPrimary}"
+                     />
 
-    <SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{StaticResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush"
+                     Color="{StaticResource SystemAccentColor}"
+                     />
 
-    <SolidColorBrush x:Key="AccentFillColorDefaultBrush" Color="{StaticResource SystemAccentColorPrimary}" />
-    <SolidColorBrush
-        x:Key="AccentFillColorSecondaryBrush"
-        Opacity="0.9"
-        Color="{StaticResource SystemAccentColorPrimary}" />
-    <SolidColorBrush
-        x:Key="AccentFillColorTertiaryBrush"
-        Opacity="0.8"
-        Color="{StaticResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="AccentFillColorDisabledBrush" Color="{StaticResource AccentFillColorDisabled}" />
+    <SolidColorBrush x:Key="AccentFillColorDefaultBrush"
+                     Color="{StaticResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="AccentFillColorSecondaryBrush"
+                     Opacity="0.9"
+                     Color="{StaticResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="AccentFillColorTertiaryBrush"
+                     Opacity="0.8"
+                     Color="{StaticResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="AccentFillColorDisabledBrush"
+                     Color="{StaticResource AccentFillColorDisabled}"
+                     />
 
 
-    <SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{StaticResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemFillColorAttentionBrush"
+                     Color="{StaticResource SystemAccentColor}"
+                     />
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Resources/DefaultContextMenu.xaml b/src/Wpf.Ui/Resources/DefaultContextMenu.xaml
index 3b0eb1c91..c83164cca 100644
--- a/src/Wpf.Ui/Resources/DefaultContextMenu.xaml
+++ b/src/Wpf.Ui/Resources/DefaultContextMenu.xaml
@@ -5,12 +5,14 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <ContextMenu x:Key="DefaultControlContextMenu">
-        <MenuItem Command="ApplicationCommands.Copy" />
-        <MenuItem Command="ApplicationCommands.Cut" />
-        <MenuItem Command="ApplicationCommands.Paste" />
+        <MenuItem Command="ApplicationCommands.Copy"/>
+        <MenuItem Command="ApplicationCommands.Cut"/>
+        <MenuItem Command="ApplicationCommands.Paste"/>
     </ContextMenu>
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Resources/DefaultFocusVisualStyle.xaml b/src/Wpf.Ui/Resources/DefaultFocusVisualStyle.xaml
index 5347117e4..61ce612f5 100644
--- a/src/Wpf.Ui/Resources/DefaultFocusVisualStyle.xaml
+++ b/src/Wpf.Ui/Resources/DefaultFocusVisualStyle.xaml
@@ -5,23 +5,27 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <Style x:Key="DefaultControlFocusVisualStyle">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Rectangle
-                        RadiusX="4"
-                        RadiusY="4"
-                        SnapsToDevicePixels="True"
-                        Stroke="{DynamicResource KeyboardFocusBorderColorBrush}"
-                        StrokeThickness="1" />
+                    <Rectangle RadiusX="4"
+                               RadiusY="4"
+                               SnapsToDevicePixels="True"
+                               Stroke="{DynamicResource KeyboardFocusBorderColorBrush}"
+                               StrokeThickness="1"
+                               />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{StaticResource DefaultControlFocusVisualStyle}" />
+    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}"
+           BasedOn="{StaticResource DefaultControlFocusVisualStyle}"
+           />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Resources/DefaultTextBoxScrollViewerStyle.xaml b/src/Wpf.Ui/Resources/DefaultTextBoxScrollViewerStyle.xaml
index dd90726b2..d53b3ec13 100644
--- a/src/Wpf.Ui/Resources/DefaultTextBoxScrollViewerStyle.xaml
+++ b/src/Wpf.Ui/Resources/DefaultTextBoxScrollViewerStyle.xaml
@@ -1,22 +1,27 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <!--  TODO: Rework TextBox ScrollViewer  -->
-    <Style x:Key="DefaultTextBoxScrollViewerStyle" TargetType="{x:Type ScrollViewer}">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="CanContentScroll" Value="False" />
-        <Setter Property="HorizontalScrollBarVisibility" Value="Hidden" />
-        <Setter Property="IsDeferredScrollingEnabled" Value="False" />
-        <Setter Property="VerticalScrollBarVisibility" Value="Hidden" />
+    <Style x:Key="DefaultTextBoxScrollViewerStyle"
+           TargetType="{x:Type ScrollViewer}"
+           >
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="CanContentScroll" Value="False"/>
+        <Setter Property="HorizontalScrollBarVisibility" Value="Hidden"/>
+        <Setter Property="IsDeferredScrollingEnabled" Value="False"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Hidden"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ScrollViewer}">
                     <Grid>
-                        <ScrollContentPresenter Margin="0" CanContentScroll="{TemplateBinding CanContentScroll}" />
+                        <ScrollContentPresenter Margin="0"
+                                                CanContentScroll="{TemplateBinding CanContentScroll}"
+                                                />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/Wpf.Ui/Resources/Fonts.xaml b/src/Wpf.Ui/Resources/Fonts.xaml
index a8c5ddcb6..8742c3120 100644
--- a/src/Wpf.Ui/Resources/Fonts.xaml
+++ b/src/Wpf.Ui/Resources/Fonts.xaml
@@ -7,7 +7,9 @@
     Based on Microsoft XAML for Win UI
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <FontFamily x:Key="ContentControlThemeFontFamily">Segoe Ui</FontFamily>
 
diff --git a/src/Wpf.Ui/Resources/Palette.xaml b/src/Wpf.Ui/Resources/Palette.xaml
index 13d1ba8ed..0d34ed338 100644
--- a/src/Wpf.Ui/Resources/Palette.xaml
+++ b/src/Wpf.Ui/Resources/Palette.xaml
@@ -5,7 +5,9 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <!--
         A set of a consistent color palette for use inside the application
@@ -33,25 +35,65 @@
     <Color x:Key="PaletteGreyColor">#9E9E9E</Color>
     <Color x:Key="PaletteBlueGreyColor">#607D8B</Color>
 
-    <SolidColorBrush x:Key="PalettePrimaryBrush" Color="{StaticResource PalettePrimaryColor}" />
-    <SolidColorBrush x:Key="PaletteRedBrush" Color="{StaticResource PaletteRedColor}" />
-    <SolidColorBrush x:Key="PalettePinkBrush" Color="{StaticResource PalettePinkColor}" />
-    <SolidColorBrush x:Key="PalettePurpleBrush" Color="{StaticResource PalettePurpleColor}" />
-    <SolidColorBrush x:Key="PaletteDeepPurpleBrush" Color="{StaticResource PaletteDeepPurpleColor}" />
-    <SolidColorBrush x:Key="PaletteIndigoBrush" Color="{StaticResource PaletteIndigoColor}" />
-    <SolidColorBrush x:Key="PaletteBlueBrush" Color="{StaticResource PaletteBlueColor}" />
-    <SolidColorBrush x:Key="PaletteLightBlueBrush" Color="{StaticResource PaletteLightBlueColor}" />
-    <SolidColorBrush x:Key="PaletteCyanBrush" Color="{StaticResource PaletteCyanColor}" />
-    <SolidColorBrush x:Key="PaletteTealBrush" Color="{StaticResource PaletteTealColor}" />
-    <SolidColorBrush x:Key="PaletteGreenBrush" Color="{StaticResource PaletteGreenColor}" />
-    <SolidColorBrush x:Key="PaletteLightGreenBrush" Color="{StaticResource PaletteLightGreenColor}" />
-    <SolidColorBrush x:Key="PaletteLimeBrush" Color="{StaticResource PaletteLimeColor}" />
-    <SolidColorBrush x:Key="PaletteYellowBrush" Color="{StaticResource PaletteYellowColor}" />
-    <SolidColorBrush x:Key="PaletteAmberBrush" Color="{StaticResource PaletteAmberColor}" />
-    <SolidColorBrush x:Key="PaletteOrangeBrush" Color="{StaticResource PaletteOrangeColor}" />
-    <SolidColorBrush x:Key="PaletteDeepOrangeBrush" Color="{StaticResource PaletteDeepOrangeColor}" />
-    <SolidColorBrush x:Key="PaletteBrownBrush" Color="{StaticResource PaletteBrownColor}" />
-    <SolidColorBrush x:Key="PaletteGreyBrush" Color="{StaticResource PaletteGreyColor}" />
-    <SolidColorBrush x:Key="PaletteBlueGreyBrush" Color="{StaticResource PaletteBlueGreyColor}" />
+    <SolidColorBrush x:Key="PalettePrimaryBrush"
+                     Color="{StaticResource PalettePrimaryColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteRedBrush"
+                     Color="{StaticResource PaletteRedColor}"
+                     />
+    <SolidColorBrush x:Key="PalettePinkBrush"
+                     Color="{StaticResource PalettePinkColor}"
+                     />
+    <SolidColorBrush x:Key="PalettePurpleBrush"
+                     Color="{StaticResource PalettePurpleColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteDeepPurpleBrush"
+                     Color="{StaticResource PaletteDeepPurpleColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteIndigoBrush"
+                     Color="{StaticResource PaletteIndigoColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteBlueBrush"
+                     Color="{StaticResource PaletteBlueColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteLightBlueBrush"
+                     Color="{StaticResource PaletteLightBlueColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteCyanBrush"
+                     Color="{StaticResource PaletteCyanColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteTealBrush"
+                     Color="{StaticResource PaletteTealColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteGreenBrush"
+                     Color="{StaticResource PaletteGreenColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteLightGreenBrush"
+                     Color="{StaticResource PaletteLightGreenColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteLimeBrush"
+                     Color="{StaticResource PaletteLimeColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteYellowBrush"
+                     Color="{StaticResource PaletteYellowColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteAmberBrush"
+                     Color="{StaticResource PaletteAmberColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteOrangeBrush"
+                     Color="{StaticResource PaletteOrangeColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteDeepOrangeBrush"
+                     Color="{StaticResource PaletteDeepOrangeColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteBrownBrush"
+                     Color="{StaticResource PaletteBrownColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteGreyBrush"
+                     Color="{StaticResource PaletteGreyColor}"
+                     />
+    <SolidColorBrush x:Key="PaletteBlueGreyBrush"
+                     Color="{StaticResource PaletteBlueGreyColor}"
+                     />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Resources/StaticColors.xaml b/src/Wpf.Ui/Resources/StaticColors.xaml
index 970019f9e..e8de63eb4 100644
--- a/src/Wpf.Ui/Resources/StaticColors.xaml
+++ b/src/Wpf.Ui/Resources/StaticColors.xaml
@@ -5,7 +5,9 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <Color x:Key="TextFillColorLightPrimary">#FFFFFF</Color>
     <Color x:Key="TextFillColorLightSecondary">#C5FFFFFF</Color>
@@ -13,11 +15,21 @@
     <Color x:Key="TextFillColorLightDisabled">#5DFFFFFF</Color>
     <Color x:Key="TextFillColorLightInverse">#E4000000</Color>
 
-    <SolidColorBrush x:Key="TextFillColorLightPrimaryBrush" Color="{StaticResource TextFillColorLightPrimary}" />
-    <SolidColorBrush x:Key="TextFillColorLightSecondaryBrush" Color="{StaticResource TextFillColorLightSecondary}" />
-    <SolidColorBrush x:Key="TextFillColorLightTertiaryBrush" Color="{StaticResource TextFillColorLightTertiary}" />
-    <SolidColorBrush x:Key="TextFillColorLightDisabledBrush" Color="{StaticResource TextFillColorLightDisabled}" />
-    <SolidColorBrush x:Key="TextFillColorLightInverseBrush" Color="{StaticResource TextFillColorLightInverse}" />
+    <SolidColorBrush x:Key="TextFillColorLightPrimaryBrush"
+                     Color="{StaticResource TextFillColorLightPrimary}"
+                     />
+    <SolidColorBrush x:Key="TextFillColorLightSecondaryBrush"
+                     Color="{StaticResource TextFillColorLightSecondary}"
+                     />
+    <SolidColorBrush x:Key="TextFillColorLightTertiaryBrush"
+                     Color="{StaticResource TextFillColorLightTertiary}"
+                     />
+    <SolidColorBrush x:Key="TextFillColorLightDisabledBrush"
+                     Color="{StaticResource TextFillColorLightDisabled}"
+                     />
+    <SolidColorBrush x:Key="TextFillColorLightInverseBrush"
+                     Color="{StaticResource TextFillColorLightInverse}"
+                     />
 
     <Color x:Key="TextFillColorDarkPrimary">#E4000000</Color>
     <Color x:Key="TextFillColorDarkSecondary">#BE000000</Color>
@@ -25,22 +37,40 @@
     <Color x:Key="TextFillColorDarkDisabled">#5C000000</Color>
     <Color x:Key="TextFillColorDarkInverse">#FFFFFF</Color>
 
-    <SolidColorBrush x:Key="TextFillColorDarkPrimaryBrush" Color="{StaticResource TextFillColorDarkPrimary}" />
-    <SolidColorBrush x:Key="TextFillColorDarkSecondaryBrush" Color="{StaticResource TextFillColorDarkSecondary}" />
-    <SolidColorBrush x:Key="TextFillColorDarkTertiaryBrush" Color="{StaticResource TextFillColorDarkTertiary}" />
-    <SolidColorBrush x:Key="TextFillColorDarkDisabledBrush" Color="{StaticResource TextFillColorDarkDisabled}" />
-    <SolidColorBrush x:Key="TextFillColorDarkInverseBrush" Color="{StaticResource TextFillColorDarkInverse}" />
+    <SolidColorBrush x:Key="TextFillColorDarkPrimaryBrush"
+                     Color="{StaticResource TextFillColorDarkPrimary}"
+                     />
+    <SolidColorBrush x:Key="TextFillColorDarkSecondaryBrush"
+                     Color="{StaticResource TextFillColorDarkSecondary}"
+                     />
+    <SolidColorBrush x:Key="TextFillColorDarkTertiaryBrush"
+                     Color="{StaticResource TextFillColorDarkTertiary}"
+                     />
+    <SolidColorBrush x:Key="TextFillColorDarkDisabledBrush"
+                     Color="{StaticResource TextFillColorDarkDisabled}"
+                     />
+    <SolidColorBrush x:Key="TextFillColorDarkInverseBrush"
+                     Color="{StaticResource TextFillColorDarkInverse}"
+                     />
 
     <Color x:Key="ApplicationBackgroundColorLight">#FFFAFAFA</Color>
-    <SolidColorBrush x:Key="ApplicationBackgroundColorLightBrush" Color="{StaticResource ApplicationBackgroundColorLight}" />
+    <SolidColorBrush x:Key="ApplicationBackgroundColorLightBrush"
+                     Color="{StaticResource ApplicationBackgroundColorLight}"
+                     />
 
     <Color x:Key="ApplicationBackgroundColorDark">#FF202020</Color>
-    <SolidColorBrush x:Key="ApplicationBackgroundColorDarkBrush" Color="{StaticResource ApplicationBackgroundColorDark}" />
+    <SolidColorBrush x:Key="ApplicationBackgroundColorDarkBrush"
+                     Color="{StaticResource ApplicationBackgroundColorDark}"
+                     />
 
     <Color x:Key="ControlStrongFillColorLight">#B3FFFFFF</Color>
-    <SolidColorBrush x:Key="ControlStrongFillColorLightBrush" Color="{StaticResource ControlStrongFillColorLight}" />
+    <SolidColorBrush x:Key="ControlStrongFillColorLightBrush"
+                     Color="{StaticResource ControlStrongFillColorLight}"
+                     />
 
     <Color x:Key="ControlStrongFillColorDark">#72000000</Color>
-    <SolidColorBrush x:Key="ControlStrongFillColorDarkBrush" Color="{StaticResource ControlStrongFillColorDark}" />
+    <SolidColorBrush x:Key="ControlStrongFillColorDarkBrush"
+                     Color="{StaticResource ControlStrongFillColorDark}"
+                     />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Resources/Theme/Dark.xaml b/src/Wpf.Ui/Resources/Theme/Dark.xaml
index 5a8200d85..2c5743173 100644
--- a/src/Wpf.Ui/Resources/Theme/Dark.xaml
+++ b/src/Wpf.Ui/Resources/Theme/Dark.xaml
@@ -7,7 +7,9 @@
     Based on Microsoft XAML for Win UI
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <!--
         Microsoft UI XAML
@@ -17,10 +19,14 @@
     -->
 
     <Color x:Key="ApplicationBackgroundColor">#FF202020</Color>
-    <SolidColorBrush x:Key="ApplicationBackgroundBrush" Color="{StaticResource ApplicationBackgroundColor}" />
+    <SolidColorBrush x:Key="ApplicationBackgroundBrush"
+                     Color="{StaticResource ApplicationBackgroundColor}"
+                     />
 
     <Color x:Key="KeyboardFocusBorderColor">#87FFFFFF</Color>
-    <SolidColorBrush x:Key="KeyboardFocusBorderColorBrush" Color="{StaticResource KeyboardFocusBorderColor}" />
+    <SolidColorBrush x:Key="KeyboardFocusBorderColorBrush"
+                     Color="{StaticResource KeyboardFocusBorderColor}"
+                     />
 
     <!--  Colors  -->
 
@@ -134,109 +140,269 @@
 
     <!--  Brushes  -->
 
-    <SolidColorBrush x:Key="TextFillColorPrimaryBrush" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="TextFillColorSecondaryBrush" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="TextFillColorTertiaryBrush" Color="{StaticResource TextFillColorTertiary}" />
-    <SolidColorBrush x:Key="TextFillColorDisabledBrush" Color="{StaticResource TextFillColorDisabled}" />
-    <SolidColorBrush x:Key="TextPlaceholderColorBrush" Color="{StaticResource TextPlaceholderColor}" />
-    <SolidColorBrush x:Key="TextFillColorInverseBrush" Color="{StaticResource TextFillColorInverse}" />
-
-    <SolidColorBrush x:Key="AccentTextFillColorDisabledBrush" Color="{StaticResource AccentTextFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="TextOnAccentFillColorSelectedTextBrush" Color="{StaticResource TextOnAccentFillColorSelectedText}" />
-
-    <SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="TextOnAccentFillColorSecondaryBrush" Color="{StaticResource TextOnAccentFillColorSecondary}" />
-    <SolidColorBrush x:Key="TextOnAccentFillColorDisabledBrush" Color="{StaticResource TextOnAccentFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="{StaticResource ControlFillColorDefault}" />
-    <SolidColorBrush x:Key="ControlFillColorSecondaryBrush" Color="{StaticResource ControlFillColorSecondary}" />
-    <SolidColorBrush x:Key="ControlFillColorTertiaryBrush" Color="{StaticResource ControlFillColorTertiary}" />
-    <SolidColorBrush x:Key="ControlFillColorDisabledBrush" Color="{StaticResource ControlFillColorDisabled}" />
-    <SolidColorBrush x:Key="ControlFillColorTransparentBrush" Color="{StaticResource ControlFillColorTransparent}" />
-    <SolidColorBrush x:Key="ControlFillColorInputActiveBrush" Color="{StaticResource ControlFillColorInputActive}" />
-
-    <SolidColorBrush x:Key="ControlStrongFillColorDefaultBrush" Color="{StaticResource ControlStrongFillColorDefault}" />
-    <SolidColorBrush x:Key="ControlStrongFillColorDisabledBrush" Color="{StaticResource ControlStrongFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="ControlSolidFillColorDefaultBrush" Color="{StaticResource ControlSolidFillColorDefault}" />
-
-    <SolidColorBrush x:Key="SubtleFillColorTransparentBrush" Color="{StaticResource SubtleFillColorTransparent}" />
-    <SolidColorBrush x:Key="SubtleFillColorSecondaryBrush" Color="{StaticResource SubtleFillColorSecondary}" />
-    <SolidColorBrush x:Key="SubtleFillColorTertiaryBrush" Color="{StaticResource SubtleFillColorTertiary}" />
-    <SolidColorBrush x:Key="SubtleFillColorDisabledBrush" Color="{StaticResource SubtleFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="ControlAltFillColorTransparentBrush" Color="{StaticResource ControlAltFillColorTransparent}" />
-    <SolidColorBrush x:Key="ControlAltFillColorSecondaryBrush" Color="{StaticResource ControlAltFillColorSecondary}" />
-    <SolidColorBrush x:Key="ControlAltFillColorTertiaryBrush" Color="{StaticResource ControlAltFillColorTertiary}" />
-    <SolidColorBrush x:Key="ControlAltFillColorQuarternaryBrush" Color="{StaticResource ControlAltFillColorQuarternary}" />
-    <SolidColorBrush x:Key="ControlAltFillColorDisabledBrush" Color="{StaticResource ControlAltFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="ControlOnImageFillColorDefaultBrush" Color="{StaticResource ControlOnImageFillColorDefault}" />
-    <SolidColorBrush x:Key="ControlOnImageFillColorSecondaryBrush" Color="{StaticResource ControlOnImageFillColorSecondary}" />
-    <SolidColorBrush x:Key="ControlOnImageFillColorTertiaryBrush" Color="{StaticResource ControlOnImageFillColorTertiary}" />
-    <SolidColorBrush x:Key="ControlOnImageFillColorDisabledBrush" Color="{StaticResource ControlOnImageFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="AccentFillColorDisabledBrush" Color="{StaticResource AccentFillColorDisabled}" />
-
-    <SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ControlStrokeColorSecondaryBrush" Color="{StaticResource ControlStrokeColorSecondary}" />
-    <SolidColorBrush x:Key="ControlStrokeColorTertiaryBrush" Color="{StaticResource ControlStrokeColorTertiary}" />
-    <SolidColorBrush x:Key="ControlStrokeColorOnAccentDefaultBrush" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
-    <SolidColorBrush x:Key="ControlStrokeColorOnAccentSecondaryBrush" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
-    <SolidColorBrush x:Key="ControlStrokeColorOnAccentTertiaryBrush" Color="{StaticResource ControlStrokeColorOnAccentTertiary}" />
-    <SolidColorBrush x:Key="ControlStrokeColorOnAccentDisabledBrush" Color="{StaticResource ControlStrokeColorOnAccentDisabled}" />
-
-    <SolidColorBrush x:Key="ControlStrokeColorForStrongFillWhenOnImageBrush" Color="{StaticResource ControlStrokeColorForStrongFillWhenOnImage}" />
-
-    <SolidColorBrush x:Key="CardStrokeColorDefaultBrush" Color="{StaticResource CardStrokeColorDefault}" />
-    <SolidColorBrush x:Key="CardStrokeColorDefaultSolidBrush" Color="{StaticResource CardStrokeColorDefaultSolid}" />
-
-    <SolidColorBrush x:Key="ControlStrongStrokeColorDefaultBrush" Color="{StaticResource ControlStrongStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ControlStrongStrokeColorDisabledBrush" Color="{StaticResource ControlStrongStrokeColorDisabled}" />
-
-    <SolidColorBrush x:Key="SurfaceStrokeColorDefaultBrush" Color="{StaticResource SurfaceStrokeColorDefault}" />
-    <SolidColorBrush x:Key="SurfaceStrokeColorFlyoutBrush" Color="{StaticResource SurfaceStrokeColorFlyout}" />
-    <SolidColorBrush x:Key="SurfaceStrokeColorInverseBrush" Color="{StaticResource SurfaceStrokeColorInverse}" />
-
-    <SolidColorBrush x:Key="DividerStrokeColorDefaultBrush" Color="{StaticResource DividerStrokeColorDefault}" />
-
-    <SolidColorBrush x:Key="FocusStrokeColorOuterBrush" Color="{StaticResource FocusStrokeColorOuter}" />
-    <SolidColorBrush x:Key="FocusStrokeColorInnerBrush" Color="{StaticResource FocusStrokeColorInner}" />
-
-    <SolidColorBrush x:Key="CardBackgroundFillColorDefaultBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="CardBackgroundFillColorSecondaryBrush" Color="{StaticResource CardBackgroundFillColorSecondary}" />
-
-    <SolidColorBrush x:Key="SmokeFillColorDefaultBrush" Color="{StaticResource SmokeFillColorDefault}" />
-
-    <SolidColorBrush x:Key="LayerFillColorDefaultBrush" Color="{StaticResource LayerFillColorDefault}" />
-    <SolidColorBrush x:Key="LayerFillColorAltBrush" Color="{StaticResource LayerFillColorAlt}" />
-    <SolidColorBrush x:Key="LayerOnAcrylicFillColorDefaultBrush" Color="{StaticResource LayerOnAcrylicFillColorDefault}" />
-    <SolidColorBrush x:Key="LayerOnAccentAcrylicFillColorDefaultBrush" Color="{StaticResource LayerOnAccentAcrylicFillColorDefault}" />
-
-    <SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorDefaultBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
-    <SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorSecondaryBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorSecondary}" />
-    <SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorTertiaryBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorTertiary}" />
-    <SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorTransparentBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorTransparent}" />
-
-    <SolidColorBrush x:Key="SolidBackgroundFillColorBaseBrush" Color="{StaticResource SolidBackgroundFillColorBase}" />
-    <SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
-    <SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
-    <SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{StaticResource SolidBackgroundFillColorQuarternary}" />
-    <SolidColorBrush x:Key="SolidBackgroundFillColorBaseAltBrush" Color="{StaticResource SolidBackgroundFillColorBaseAlt}" />
-
-    <SolidColorBrush x:Key="SystemFillColorSuccessBrush" Color="{StaticResource SystemFillColorSuccess}" />
-    <SolidColorBrush x:Key="SystemFillColorCautionBrush" Color="{StaticResource SystemFillColorCaution}" />
-    <SolidColorBrush x:Key="SystemFillColorCriticalBrush" Color="{StaticResource SystemFillColorCritical}" />
-    <SolidColorBrush x:Key="SystemFillColorNeutralBrush" Color="{StaticResource SystemFillColorNeutral}" />
-    <SolidColorBrush x:Key="SystemFillColorSolidNeutralBrush" Color="{StaticResource SystemFillColorSolidNeutral}" />
-    <SolidColorBrush x:Key="SystemFillColorAttentionBackgroundBrush" Color="{StaticResource SystemFillColorAttentionBackground}" />
-    <SolidColorBrush x:Key="SystemFillColorSuccessBackgroundBrush" Color="{StaticResource SystemFillColorSuccessBackground}" />
-    <SolidColorBrush x:Key="SystemFillColorCautionBackgroundBrush" Color="{StaticResource SystemFillColorCautionBackground}" />
-    <SolidColorBrush x:Key="SystemFillColorCriticalBackgroundBrush" Color="{StaticResource SystemFillColorCriticalBackground}" />
-    <SolidColorBrush x:Key="SystemFillColorNeutralBackgroundBrush" Color="{StaticResource SystemFillColorNeutralBackground}" />
-    <SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemFillColorSolidAttentionBackground}" />
-    <SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
+    <SolidColorBrush x:Key="TextFillColorPrimaryBrush"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="TextFillColorSecondaryBrush"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="TextFillColorTertiaryBrush"
+                     Color="{StaticResource TextFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="TextFillColorDisabledBrush"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="TextPlaceholderColorBrush"
+                     Color="{StaticResource TextPlaceholderColor}"
+                     />
+    <SolidColorBrush x:Key="TextFillColorInverseBrush"
+                     Color="{StaticResource TextFillColorInverse}"
+                     />
+
+    <SolidColorBrush x:Key="AccentTextFillColorDisabledBrush"
+                     Color="{StaticResource AccentTextFillColorDisabled}"
+                     />
+
+    <SolidColorBrush x:Key="TextOnAccentFillColorSelectedTextBrush"
+                     Color="{StaticResource TextOnAccentFillColorSelectedText}"
+                     />
+
+    <SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush"
+                     Color="{StaticResource TextOnAccentFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="TextOnAccentFillColorSecondaryBrush"
+                     Color="{StaticResource TextOnAccentFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="TextOnAccentFillColorDisabledBrush"
+                     Color="{StaticResource TextOnAccentFillColorDisabled}"
+                     />
+
+    <SolidColorBrush x:Key="ControlFillColorDefaultBrush"
+                     Color="{StaticResource ControlFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ControlFillColorSecondaryBrush"
+                     Color="{StaticResource ControlFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ControlFillColorTertiaryBrush"
+                     Color="{StaticResource ControlFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="ControlFillColorDisabledBrush"
+                     Color="{StaticResource ControlFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="ControlFillColorTransparentBrush"
+                     Color="{StaticResource ControlFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="ControlFillColorInputActiveBrush"
+                     Color="{StaticResource ControlFillColorInputActive}"
+                     />
+
+    <SolidColorBrush x:Key="ControlStrongFillColorDefaultBrush"
+                     Color="{StaticResource ControlStrongFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ControlStrongFillColorDisabledBrush"
+                     Color="{StaticResource ControlStrongFillColorDisabled}"
+                     />
+
+    <SolidColorBrush x:Key="ControlSolidFillColorDefaultBrush"
+                     Color="{StaticResource ControlSolidFillColorDefault}"
+                     />
+
+    <SolidColorBrush x:Key="SubtleFillColorTransparentBrush"
+                     Color="{StaticResource SubtleFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="SubtleFillColorSecondaryBrush"
+                     Color="{StaticResource SubtleFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="SubtleFillColorTertiaryBrush"
+                     Color="{StaticResource SubtleFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="SubtleFillColorDisabledBrush"
+                     Color="{StaticResource SubtleFillColorDisabled}"
+                     />
+
+    <SolidColorBrush x:Key="ControlAltFillColorTransparentBrush"
+                     Color="{StaticResource ControlAltFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="ControlAltFillColorSecondaryBrush"
+                     Color="{StaticResource ControlAltFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ControlAltFillColorTertiaryBrush"
+                     Color="{StaticResource ControlAltFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="ControlAltFillColorQuarternaryBrush"
+                     Color="{StaticResource ControlAltFillColorQuarternary}"
+                     />
+    <SolidColorBrush x:Key="ControlAltFillColorDisabledBrush"
+                     Color="{StaticResource ControlAltFillColorDisabled}"
+                     />
+
+    <SolidColorBrush x:Key="ControlOnImageFillColorDefaultBrush"
+                     Color="{StaticResource ControlOnImageFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ControlOnImageFillColorSecondaryBrush"
+                     Color="{StaticResource ControlOnImageFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ControlOnImageFillColorTertiaryBrush"
+                     Color="{StaticResource ControlOnImageFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="ControlOnImageFillColorDisabledBrush"
+                     Color="{StaticResource ControlOnImageFillColorDisabled}"
+                     />
+
+    <SolidColorBrush x:Key="AccentFillColorDisabledBrush"
+                     Color="{StaticResource AccentFillColorDisabled}"
+                     />
+
+    <SolidColorBrush x:Key="ControlStrokeColorDefaultBrush"
+                     Color="{StaticResource ControlStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ControlStrokeColorSecondaryBrush"
+                     Color="{StaticResource ControlStrokeColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ControlStrokeColorTertiaryBrush"
+                     Color="{StaticResource ControlStrokeColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="ControlStrokeColorOnAccentDefaultBrush"
+                     Color="{StaticResource ControlStrokeColorOnAccentDefault}"
+                     />
+    <SolidColorBrush x:Key="ControlStrokeColorOnAccentSecondaryBrush"
+                     Color="{StaticResource ControlStrokeColorOnAccentSecondary}"
+                     />
+    <SolidColorBrush x:Key="ControlStrokeColorOnAccentTertiaryBrush"
+                     Color="{StaticResource ControlStrokeColorOnAccentTertiary}"
+                     />
+    <SolidColorBrush x:Key="ControlStrokeColorOnAccentDisabledBrush"
+                     Color="{StaticResource ControlStrokeColorOnAccentDisabled}"
+                     />
+
+    <SolidColorBrush x:Key="ControlStrokeColorForStrongFillWhenOnImageBrush"
+                     Color="{StaticResource ControlStrokeColorForStrongFillWhenOnImage}"
+                     />
+
+    <SolidColorBrush x:Key="CardStrokeColorDefaultBrush"
+                     Color="{StaticResource CardStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="CardStrokeColorDefaultSolidBrush"
+                     Color="{StaticResource CardStrokeColorDefaultSolid}"
+                     />
+
+    <SolidColorBrush x:Key="ControlStrongStrokeColorDefaultBrush"
+                     Color="{StaticResource ControlStrongStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ControlStrongStrokeColorDisabledBrush"
+                     Color="{StaticResource ControlStrongStrokeColorDisabled}"
+                     />
+
+    <SolidColorBrush x:Key="SurfaceStrokeColorDefaultBrush"
+                     Color="{StaticResource SurfaceStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="SurfaceStrokeColorFlyoutBrush"
+                     Color="{StaticResource SurfaceStrokeColorFlyout}"
+                     />
+    <SolidColorBrush x:Key="SurfaceStrokeColorInverseBrush"
+                     Color="{StaticResource SurfaceStrokeColorInverse}"
+                     />
+
+    <SolidColorBrush x:Key="DividerStrokeColorDefaultBrush"
+                     Color="{StaticResource DividerStrokeColorDefault}"
+                     />
+
+    <SolidColorBrush x:Key="FocusStrokeColorOuterBrush"
+                     Color="{StaticResource FocusStrokeColorOuter}"
+                     />
+    <SolidColorBrush x:Key="FocusStrokeColorInnerBrush"
+                     Color="{StaticResource FocusStrokeColorInner}"
+                     />
+
+    <SolidColorBrush x:Key="CardBackgroundFillColorDefaultBrush"
+                     Color="{StaticResource CardBackgroundFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="CardBackgroundFillColorSecondaryBrush"
+                     Color="{StaticResource CardBackgroundFillColorSecondary}"
+                     />
+
+    <SolidColorBrush x:Key="SmokeFillColorDefaultBrush"
+                     Color="{StaticResource SmokeFillColorDefault}"
+                     />
+
+    <SolidColorBrush x:Key="LayerFillColorDefaultBrush"
+                     Color="{StaticResource LayerFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="LayerFillColorAltBrush"
+                     Color="{StaticResource LayerFillColorAlt}"
+                     />
+    <SolidColorBrush x:Key="LayerOnAcrylicFillColorDefaultBrush"
+                     Color="{StaticResource LayerOnAcrylicFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="LayerOnAccentAcrylicFillColorDefaultBrush"
+                     Color="{StaticResource LayerOnAccentAcrylicFillColorDefault}"
+                     />
+
+    <SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorDefaultBrush"
+                     Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorSecondaryBrush"
+                     Color="{StaticResource LayerOnMicaBaseAltFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorTertiaryBrush"
+                     Color="{StaticResource LayerOnMicaBaseAltFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorTransparentBrush"
+                     Color="{StaticResource LayerOnMicaBaseAltFillColorTransparent}"
+                     />
+
+    <SolidColorBrush x:Key="SolidBackgroundFillColorBaseBrush"
+                     Color="{StaticResource SolidBackgroundFillColorBase}"
+                     />
+    <SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush"
+                     Color="{StaticResource SolidBackgroundFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush"
+                     Color="{StaticResource SolidBackgroundFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush"
+                     Color="{StaticResource SolidBackgroundFillColorQuarternary}"
+                     />
+    <SolidColorBrush x:Key="SolidBackgroundFillColorBaseAltBrush"
+                     Color="{StaticResource SolidBackgroundFillColorBaseAlt}"
+                     />
+
+    <SolidColorBrush x:Key="SystemFillColorSuccessBrush"
+                     Color="{StaticResource SystemFillColorSuccess}"
+                     />
+    <SolidColorBrush x:Key="SystemFillColorCautionBrush"
+                     Color="{StaticResource SystemFillColorCaution}"
+                     />
+    <SolidColorBrush x:Key="SystemFillColorCriticalBrush"
+                     Color="{StaticResource SystemFillColorCritical}"
+                     />
+    <SolidColorBrush x:Key="SystemFillColorNeutralBrush"
+                     Color="{StaticResource SystemFillColorNeutral}"
+                     />
+    <SolidColorBrush x:Key="SystemFillColorSolidNeutralBrush"
+                     Color="{StaticResource SystemFillColorSolidNeutral}"
+                     />
+    <SolidColorBrush x:Key="SystemFillColorAttentionBackgroundBrush"
+                     Color="{StaticResource SystemFillColorAttentionBackground}"
+                     />
+    <SolidColorBrush x:Key="SystemFillColorSuccessBackgroundBrush"
+                     Color="{StaticResource SystemFillColorSuccessBackground}"
+                     />
+    <SolidColorBrush x:Key="SystemFillColorCautionBackgroundBrush"
+                     Color="{StaticResource SystemFillColorCautionBackground}"
+                     />
+    <SolidColorBrush x:Key="SystemFillColorCriticalBackgroundBrush"
+                     Color="{StaticResource SystemFillColorCriticalBackground}"
+                     />
+    <SolidColorBrush x:Key="SystemFillColorNeutralBackgroundBrush"
+                     Color="{StaticResource SystemFillColorNeutralBackground}"
+                     />
+    <SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush"
+                     Color="{StaticResource SystemFillColorSolidAttentionBackground}"
+                     />
+    <SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush"
+                     Color="{StaticResource SystemFillColorSolidNeutralBackground}"
+                     />
 
     <!--  Elevation border brushes  -->
 
@@ -245,41 +411,41 @@
             <ScaleTransform CenterY="0.5" ScaleY="-1" />
         </LinearGradientBrush.RelativeTransform>-->
         <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorSecondary}" />
-            <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
+            <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorSecondary}"/>
+            <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="CircleElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,1">
         <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.70" Color="{StaticResource ControlStrokeColorSecondary}" />
-            <GradientStop Offset="0.50" Color="{StaticResource ControlStrokeColorDefault}" />
+            <GradientStop Offset="0.70" Color="{StaticResource ControlStrokeColorSecondary}"/>
+            <GradientStop Offset="0.50" Color="{StaticResource ControlStrokeColorDefault}"/>
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
         <LinearGradientBrush.RelativeTransform>
-            <ScaleTransform CenterY="0.5" ScaleY="-1" />
+            <ScaleTransform CenterY="0.5" ScaleY="-1"/>
         </LinearGradientBrush.RelativeTransform>
         <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
-            <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
+            <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}"/>
+            <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}"/>
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,2">
         <LinearGradientBrush.GradientStops>
-            <GradientStop Offset="0.0" Color="{StaticResource ControlStrokeColorDefault}" />
-            <GradientStop Offset="1.0" Color="{StaticResource ControlStrongStrokeColorDefault}" />
+            <GradientStop Offset="0.0" Color="{StaticResource ControlStrokeColorDefault}"/>
+            <GradientStop Offset="1.0" Color="{StaticResource ControlStrongStrokeColorDefault}"/>
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
 
-    <DrawingBrush
-        x:Key="StripedBackgroundBrush"
-        Stretch="UniformToFill"
-        TileMode="Tile"
-        Viewport="0,0,10,10"
-        ViewportUnits="Absolute">
+    <DrawingBrush x:Key="StripedBackgroundBrush"
+                  Stretch="UniformToFill"
+                  TileMode="Tile"
+                  Viewport="0,0,10,10"
+                  ViewportUnits="Absolute"
+                  >
         <DrawingBrush.Drawing>
             <DrawingGroup>
                 <DrawingGroup.Children>
@@ -288,20 +454,20 @@
                             <GeometryGroup FillRule="Nonzero">
                                 <PathGeometry>
                                     <PathFigure StartPoint="0,0">
-                                        <LineSegment Point="25,0" />
-                                        <LineSegment Point="100,75" />
-                                        <LineSegment Point="100,100" />
-                                        <LineSegment Point="75,100" />
-                                        <LineSegment Point="0,25" />
-                                        <LineSegment Point="0,0" />
+                                        <LineSegment Point="25,0"/>
+                                        <LineSegment Point="100,75"/>
+                                        <LineSegment Point="100,100"/>
+                                        <LineSegment Point="75,100"/>
+                                        <LineSegment Point="0,25"/>
+                                        <LineSegment Point="0,0"/>
                                     </PathFigure>
                                     <PathFigure StartPoint="75,0">
-                                        <LineSegment Point="100,25" />
-                                        <LineSegment Point="100,0" />
+                                        <LineSegment Point="100,25"/>
+                                        <LineSegment Point="100,0"/>
                                     </PathFigure>
                                     <PathFigure StartPoint="0,75">
-                                        <LineSegment Point="25,100" />
-                                        <LineSegment Point="0,100" />
+                                        <LineSegment Point="25,100"/>
+                                        <LineSegment Point="0,100"/>
                                     </PathFigure>
                                 </PathGeometry>
                             </GeometryGroup>
@@ -316,352 +482,848 @@
     <!--  Control brushes  -->
 
     <!--  Badge  -->
-    <SolidColorBrush x:Key="BadgeForeground" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="BadgeBackground" Color="{StaticResource SystemAccentColorPrimary}" />
+    <SolidColorBrush x:Key="BadgeForeground"
+                     Color="{StaticResource TextOnAccentFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="BadgeBackground"
+                     Color="{StaticResource SystemAccentColorPrimary}"
+                     />
 
     <!--  BreadcrumbBar  -->
-    <SolidColorBrush x:Key="BreadcrumbBarNormalForegroundBrush" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="BreadcrumbBarHoverForegroundBrush" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="BreadcrumbBarCurrentNormalForegroundBrush" Color="{StaticResource TextFillColorPrimary}" />
+    <SolidColorBrush x:Key="BreadcrumbBarNormalForegroundBrush"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="BreadcrumbBarHoverForegroundBrush"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="BreadcrumbBarCurrentNormalForegroundBrush"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
 
     <!--  Button  -->
-    <SolidColorBrush x:Key="AccentButtonBackground" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="AccentButtonBackgroundPointerOver" Color="{DynamicResource SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="AccentButtonBackgroundPressed" Color="{DynamicResource SystemAccentColorTertiary}" />
+    <SolidColorBrush x:Key="AccentButtonBackground"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="AccentButtonBackgroundPointerOver"
+                     Color="{DynamicResource SystemAccentColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="AccentButtonBackgroundPressed"
+                     Color="{DynamicResource SystemAccentColorTertiary}"
+                     />
     <!--<SolidColorBrush x:Key="AccentButtonBackgroundDisabled" ResourceKey="AccentFillColorDisabledBrush" />-->
-    <SolidColorBrush x:Key="AccentButtonForeground" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="AccentButtonForegroundPointerOver" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="AccentButtonForegroundPressed" Color="{StaticResource TextOnAccentFillColorSecondary}" />
+    <SolidColorBrush x:Key="AccentButtonForeground"
+                     Color="{StaticResource TextOnAccentFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="AccentButtonForegroundPointerOver"
+                     Color="{StaticResource TextOnAccentFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="AccentButtonForegroundPressed"
+                     Color="{StaticResource TextOnAccentFillColorSecondary}"
+                     />
     <!--<SolidColorBrush x:Key="AccentButtonForegroundDisabled" ResourceKey="TextOnAccentFillColorDisabled" />-->
     <!--<SolidColorBrush x:Key="AccentButtonBorderBrush" Color="{DynamicResource AccentControlElevationBorder}" />-->
     <!--<SolidColorBrush x:Key="AccentButtonBorderBrushPointerOver" Color="{DynamicResource AccentControlElevationBorder}" />-->
-    <SolidColorBrush x:Key="AccentButtonBorderBrushPressed" Color="{DynamicResource ControlFillColorTransparent}" />
+    <SolidColorBrush x:Key="AccentButtonBorderBrushPressed"
+                     Color="{DynamicResource ControlFillColorTransparent}"
+                     />
     <!--<SolidColorBrush x:Key="AccentButtonBorderBrushDisabled" Color="{DynamicResource ControlFillColorTransparentBrush}" />-->
-    <SolidColorBrush x:Key="ButtonBackground" Color="{StaticResource ControlFillColorDefault}" />
-    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{StaticResource ControlFillColorSecondary}" />
-    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{StaticResource ControlFillColorTertiary}" />
-    <SolidColorBrush x:Key="ButtonBackgroundDisabled" Color="{StaticResource ControlFillColorDisabled}" />
-    <SolidColorBrush x:Key="ButtonForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="ButtonForegroundPressed" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="ButtonForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
+    <SolidColorBrush x:Key="ButtonBackground"
+                     Color="{StaticResource ControlFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ButtonBackgroundPointerOver"
+                     Color="{StaticResource ControlFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ButtonBackgroundPressed"
+                     Color="{StaticResource ControlFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="ButtonBackgroundDisabled"
+                     Color="{StaticResource ControlFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="ButtonForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ButtonForegroundPointerOver"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ButtonForegroundPressed"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ButtonForegroundDisabled"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
     <!--<SolidColorBrush x:Key="ButtonBorderBrush" Color="{StaticResource ControlElevationBorder}" />-->
     <!--<SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="{StaticResource ControlElevationBorder}" />-->
-    <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ButtonBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
+    <SolidColorBrush x:Key="ButtonBorderBrushPressed"
+                     Color="{StaticResource ControlStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ButtonBorderBrushDisabled"
+                     Color="{StaticResource ControlStrokeColorDefault}"
+                     />
 
     <!--  Calendar  -->
-    <SolidColorBrush x:Key="CalendarViewForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="CalendarViewBackground" Color="{StaticResource AcrylicBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="CalendarViewBorderBrush" Color="{StaticResource SurfaceStrokeColorFlyout}" />
-    <SolidColorBrush x:Key="CalendarViewItemBackgroundPointerOver" Color="{StaticResource ControlFillColorSecondary}" />
-    <SolidColorBrush x:Key="CalendarViewSelectedBackground" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="CalendarViewSelectedBorderBrush" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="CalendarViewTodayBackground" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="CalendarViewTodayForeground" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="CalendarViewButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
+    <SolidColorBrush x:Key="CalendarViewForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="CalendarViewBackground"
+                     Color="{StaticResource AcrylicBackgroundFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="CalendarViewBorderBrush"
+                     Color="{StaticResource SurfaceStrokeColorFlyout}"
+                     />
+    <SolidColorBrush x:Key="CalendarViewItemBackgroundPointerOver"
+                     Color="{StaticResource ControlFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="CalendarViewSelectedBackground"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="CalendarViewSelectedBorderBrush"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="CalendarViewTodayBackground"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="CalendarViewTodayForeground"
+                     Color="{StaticResource TextOnAccentFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="CalendarViewButtonForeground"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
 
     <!--  Card / CardAction / CardColor / CardExpander  -->
-    <SolidColorBrush x:Key="CardBackground" Color="{StaticResource CardBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="CardBackgroundPointerOver" Color="{StaticResource ControlFillColorSecondary}" />
-    <SolidColorBrush x:Key="CardBackgroundPressed" Color="{StaticResource ControlFillColorTertiary}" />
-    <SolidColorBrush x:Key="CardBackgroundDisabled" Color="{StaticResource ControlFillColorDisabled}" />
-    <SolidColorBrush x:Key="CardForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="CardForegroundPointerOver" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="CardForegroundPressed" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="CardForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
-    <SolidColorBrush x:Key="CardBorderBrush" Color="{StaticResource CardStrokeColorDefault}" />
+    <SolidColorBrush x:Key="CardBackground"
+                     Color="{StaticResource CardBackgroundFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="CardBackgroundPointerOver"
+                     Color="{StaticResource ControlFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="CardBackgroundPressed"
+                     Color="{StaticResource ControlFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="CardBackgroundDisabled"
+                     Color="{StaticResource ControlFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="CardForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="CardForegroundPointerOver"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="CardForegroundPressed"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="CardForegroundDisabled"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="CardBorderBrush"
+                     Color="{StaticResource CardStrokeColorDefault}"
+                     />
     <!--<SolidColorBrush x:Key="CardBorderBrushPointerOver" Color="{StaticResource ControlElevationBorderBrush}" />-->
-    <SolidColorBrush x:Key="CardBorderBrushPressed" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="CardBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="CardFooterBackground" Color="{StaticResource CardBackgroundFillColorSecondary}" />
+    <SolidColorBrush x:Key="CardBorderBrushPressed"
+                     Color="{StaticResource ControlStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="CardBorderBrushDisabled"
+                     Color="{StaticResource ControlStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="CardFooterBackground"
+                     Color="{StaticResource CardBackgroundFillColorSecondary}"
+                     />
 
     <!--  CheckBox  -->
-    <SolidColorBrush x:Key="CheckBoxBackground" Color="{StaticResource ControlAltFillColorSecondary}" />
-    <SolidColorBrush x:Key="CheckBoxForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="CheckBoxBorderBrush" Color="{StaticResource ControlStrongStrokeColorDefault}" />
-    <SolidColorBrush x:Key="CheckBoxCheckBorderBrush" Color="{StaticResource SubtleFillColorTransparent}" />
-    <SolidColorBrush x:Key="CheckBoxCheckGlyphForeground" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="CheckBoxCheckBackgroundFillChecked" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="CheckBoxCheckBackgroundFillCheckedPointerOver" Color="{DynamicResource SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" Color="{StaticResource ControlAltFillColorTertiary}" />
-    <SolidColorBrush x:Key="CheckBoxCheckBackgroundFillUncheckedDisabled" Color="{StaticResource ControlAltFillColorDisabled}" />
-    <SolidColorBrush x:Key="CheckBoxCheckBackgroundStrokeUncheckedDisabled" Color="{StaticResource ControlStrongStrokeColorDisabled}" />
-    <SolidColorBrush x:Key="CheckBoxForegroundUncheckedDisabled" Color="{StaticResource TextFillColorDisabled}" />
+    <SolidColorBrush x:Key="CheckBoxBackground"
+                     Color="{StaticResource ControlAltFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="CheckBoxForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="CheckBoxBorderBrush"
+                     Color="{StaticResource ControlStrongStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="CheckBoxCheckBorderBrush"
+                     Color="{StaticResource SubtleFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="CheckBoxCheckGlyphForeground"
+                     Color="{StaticResource TextOnAccentFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="CheckBoxCheckBackgroundFillChecked"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="CheckBoxCheckBackgroundFillCheckedPointerOver"
+                     Color="{DynamicResource SystemAccentColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver"
+                     Color="{StaticResource ControlAltFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="CheckBoxCheckBackgroundFillUncheckedDisabled"
+                     Color="{StaticResource ControlAltFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="CheckBoxCheckBackgroundStrokeUncheckedDisabled"
+                     Color="{StaticResource ControlStrongStrokeColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="CheckBoxForegroundUncheckedDisabled"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
 
     <!--  ColorPicker  -->
     <!--  TODO  -->
 
     <!--  ComboBox  -->
-    <SolidColorBrush x:Key="ComboBoxBackground" Color="{StaticResource ControlFillColorDefault}" />
-    <SolidColorBrush x:Key="ComboBoxBackgroundFocused" Color="{StaticResource ControlFillColorDefault}" />
-    <SolidColorBrush x:Key="ComboBoxBackgroundPointerOver" Color="{StaticResource ControlFillColorSecondary}" />
-    <SolidColorBrush x:Key="ComboBoxBackgroundDisabled" Color="{StaticResource ControlFillColorDisabled}" />
-    <SolidColorBrush x:Key="ComboBoxForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="ComboBoxForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
+    <SolidColorBrush x:Key="ComboBoxBackground"
+                     Color="{StaticResource ControlFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxBackgroundFocused"
+                     Color="{StaticResource ControlFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxBackgroundPointerOver"
+                     Color="{StaticResource ControlFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxBackgroundDisabled"
+                     Color="{StaticResource ControlFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxForegroundDisabled"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
     <!--<SolidColorBrush x:Key="ComboBoxItemBorderBrush" Color="{StaticResource ControlElevationBorderBrush}" />-->
-    <SolidColorBrush x:Key="ComboBoxBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ComboBoxBorderBrushFocused" Color="{DynamicResource SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="ComboBoxDropDownGlyphForeground" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="ComboBoxDropDownBackground" Color="{StaticResource AcrylicBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="ComboBoxDropDownBorderBrush" Color="{StaticResource SurfaceStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ComboBoxItemPillFillBrush" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="ComboBoxItemBackgroundSelected" Color="{StaticResource SubtleFillColorSecondary}" />
-    <SolidColorBrush x:Key="ComboBoxItemForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="ComboBoxItemForegroundSelected" Color="{StaticResource TextFillColorPrimary}" />
+    <SolidColorBrush x:Key="ComboBoxBorderBrushDisabled"
+                     Color="{StaticResource ControlStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxBorderBrushFocused"
+                     Color="{DynamicResource SystemAccentColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxDropDownGlyphForeground"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxDropDownBackground"
+                     Color="{StaticResource AcrylicBackgroundFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxDropDownBorderBrush"
+                     Color="{StaticResource SurfaceStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxItemPillFillBrush"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxItemBackgroundSelected"
+                     Color="{StaticResource SubtleFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxItemForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ComboBoxItemForegroundSelected"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
 
     <!--  ContentDialog  -->
-    <SolidColorBrush x:Key="ContentDialogSmokeFill" Color="{StaticResource SmokeFillColorDefault}" />
-    <SolidColorBrush x:Key="ContentDialogBackground" Color="{StaticResource SolidBackgroundFillColorBase}" />
-    <SolidColorBrush x:Key="ContentDialogTopOverlay" Color="{StaticResource LayerFillColorAlt}" />
-    <SolidColorBrush x:Key="ContentDialogBorderBrush" Color="{StaticResource SurfaceStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ContentDialogSeparatorBorderBrush" Color="{StaticResource CardStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ContentDialogForeground" Color="{StaticResource TextFillColorPrimary}" />
+    <SolidColorBrush x:Key="ContentDialogSmokeFill"
+                     Color="{StaticResource SmokeFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ContentDialogBackground"
+                     Color="{StaticResource SolidBackgroundFillColorBase}"
+                     />
+    <SolidColorBrush x:Key="ContentDialogTopOverlay"
+                     Color="{StaticResource LayerFillColorAlt}"
+                     />
+    <SolidColorBrush x:Key="ContentDialogBorderBrush"
+                     Color="{StaticResource SurfaceStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ContentDialogSeparatorBorderBrush"
+                     Color="{StaticResource CardStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ContentDialogForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
 
     <!--  ContextMenu  -->
-    <SolidColorBrush x:Key="ContextMenuBackground" Color="{StaticResource AcrylicBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="ContextMenuBorderBrush" Color="{StaticResource SurfaceStrokeColorFlyout}" />
-    <SolidColorBrush x:Key="ContextMenuForeground" Color="{StaticResource TextFillColorPrimary}" />
+    <SolidColorBrush x:Key="ContextMenuBackground"
+                     Color="{StaticResource AcrylicBackgroundFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ContextMenuBorderBrush"
+                     Color="{StaticResource SurfaceStrokeColorFlyout}"
+                     />
+    <SolidColorBrush x:Key="ContextMenuForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
 
     <!--  DataGrid  -->
     <!--  TODO  -->
 
     <!--  DynamicScrollBar  -->
-    <SolidColorBrush x:Key="ScrollBarTrackFillPointerOver" Color="{StaticResource AcrylicBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="ScrollBarButtonBackground" Color="{StaticResource SubtleFillColorTransparent}" />
-    <SolidColorBrush x:Key="ScrollBarButtonArrowForeground" Color="{StaticResource ControlStrongFillColorDefault}" />
-    <SolidColorBrush x:Key="ScrollBarThumbFill" Color="{StaticResource ControlStrongFillColorDefault}" />
+    <SolidColorBrush x:Key="ScrollBarTrackFillPointerOver"
+                     Color="{StaticResource AcrylicBackgroundFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ScrollBarButtonBackground"
+                     Color="{StaticResource SubtleFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="ScrollBarButtonArrowForeground"
+                     Color="{StaticResource ControlStrongFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ScrollBarThumbFill"
+                     Color="{StaticResource ControlStrongFillColorDefault}"
+                     />
 
     <!--  Expander  -->
-    <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="{StaticResource CardBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="ExpanderHeaderBorderBrush" Color="{StaticResource CardStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ExpanderHeaderBorderPointerOverBrush" Color="{StaticResource CardStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Color="{StaticResource TextFillColorDisabled}" />
-    <SolidColorBrush x:Key="ExpanderHeaderDisabledBorderBrush" Color="{StaticResource CardStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ExpanderContentBackground" Color="{StaticResource CardBackgroundFillColorSecondary}" />
+    <SolidColorBrush x:Key="ExpanderHeaderBackground"
+                     Color="{StaticResource CardBackgroundFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ExpanderHeaderForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ExpanderHeaderBorderBrush"
+                     Color="{StaticResource CardStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ExpanderHeaderBorderPointerOverBrush"
+                     Color="{StaticResource CardStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="ExpanderHeaderDisabledBorderBrush"
+                     Color="{StaticResource CardStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ExpanderContentBackground"
+                     Color="{StaticResource CardBackgroundFillColorSecondary}"
+                     />
 
     <!--  FluentWindow  -->
-    <SolidColorBrush x:Key="WindowBackground" Color="{StaticResource ApplicationBackgroundColor}" />
-    <SolidColorBrush x:Key="WindowForeground" Color="{StaticResource TextFillColorPrimary}" />
+    <SolidColorBrush x:Key="WindowBackground"
+                     Color="{StaticResource ApplicationBackgroundColor}"
+                     />
+    <SolidColorBrush x:Key="WindowForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
 
     <!--  Flyout  -->
-    <SolidColorBrush x:Key="FlyoutBackground" Color="{StaticResource AcrylicBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="FlyoutBorderBrush" Color="{StaticResource SurfaceStrokeColorFlyout}" />
+    <SolidColorBrush x:Key="FlyoutBackground"
+                     Color="{StaticResource AcrylicBackgroundFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="FlyoutBorderBrush"
+                     Color="{StaticResource SurfaceStrokeColorFlyout}"
+                     />
 
     <!--  HyperlinkButton  -->
-    <SolidColorBrush x:Key="HyperlinkButtonBackground" Color="{StaticResource SubtleFillColorTransparent}" />
-    <SolidColorBrush x:Key="HyperlinkButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
-    <SolidColorBrush x:Key="HyperlinkButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
-    <SolidColorBrush x:Key="HyperlinkButtonBackgroundDisabled" Color="{StaticResource SubtleFillColorDisabled}" />
-    <SolidColorBrush x:Key="HyperlinkButtonForeground" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="HyperlinkButtonForegroundPointerOver" Color="{DynamicResource SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="HyperlinkButtonForegroundPressed" Color="{DynamicResource SystemAccentColorTertiary}" />
-    <SolidColorBrush x:Key="HyperlinkButtonForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
+    <SolidColorBrush x:Key="HyperlinkButtonBackground"
+                     Color="{StaticResource SubtleFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="HyperlinkButtonBackgroundPointerOver"
+                     Color="{StaticResource SubtleFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="HyperlinkButtonBackgroundPressed"
+                     Color="{StaticResource SubtleFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="HyperlinkButtonBackgroundDisabled"
+                     Color="{StaticResource SubtleFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="HyperlinkButtonForeground"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="HyperlinkButtonForegroundPointerOver"
+                     Color="{DynamicResource SystemAccentColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="HyperlinkButtonForegroundPressed"
+                     Color="{DynamicResource SystemAccentColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="HyperlinkButtonForegroundDisabled"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
 
     <!--  InfoBadge  -->
-    <SolidColorBrush x:Key="InfoBadgeValueForeground" Color="{StaticResource TextFillColorInverse}" />
-
-    <SolidColorBrush x:Key="InfoBadgeAttentionSeverityBackgroundBrush" Color="{StaticResource SystemFillColorAttention}" />
-    <SolidColorBrush x:Key="InfoBadgeInformationalSeverityBackgroundBrush" Color="{StaticResource SystemFillColorInformational}" />
-    <SolidColorBrush x:Key="InfoBadgeSuccessSeverityBackgroundBrush" Color="{StaticResource SystemFillColorSuccess}" />
-    <SolidColorBrush x:Key="InfoBadgeCautionSeverityBackgroundBrush" Color="{StaticResource SystemFillColorCaution}" />
-    <SolidColorBrush x:Key="InfoBadgeCriticalSeverityBackgroundBrush" Color="{StaticResource SystemFillColorCritical}" />
+    <SolidColorBrush x:Key="InfoBadgeValueForeground"
+                     Color="{StaticResource TextFillColorInverse}"
+                     />
+
+    <SolidColorBrush x:Key="InfoBadgeAttentionSeverityBackgroundBrush"
+                     Color="{StaticResource SystemFillColorAttention}"
+                     />
+    <SolidColorBrush x:Key="InfoBadgeInformationalSeverityBackgroundBrush"
+                     Color="{StaticResource SystemFillColorInformational}"
+                     />
+    <SolidColorBrush x:Key="InfoBadgeSuccessSeverityBackgroundBrush"
+                     Color="{StaticResource SystemFillColorSuccess}"
+                     />
+    <SolidColorBrush x:Key="InfoBadgeCautionSeverityBackgroundBrush"
+                     Color="{StaticResource SystemFillColorCaution}"
+                     />
+    <SolidColorBrush x:Key="InfoBadgeCriticalSeverityBackgroundBrush"
+                     Color="{StaticResource SystemFillColorCritical}"
+                     />
 
     <!--  InfoBar  -->
-    <SolidColorBrush x:Key="InfoBarBorderBrush" Color="{StaticResource CardStrokeColorDefault}" />
-    <SolidColorBrush x:Key="InfoBarTitleForeground" Color="{StaticResource TextFillColorPrimary}" />
-
-    <SolidColorBrush x:Key="InfoBarErrorSeverityBackgroundBrush" Color="{StaticResource SystemFillColorCriticalBackground}" />
-    <SolidColorBrush x:Key="InfoBarWarningSeverityBackgroundBrush" Color="{StaticResource SystemFillColorCautionBackground}" />
-    <SolidColorBrush x:Key="InfoBarSuccessSeverityBackgroundBrush" Color="{StaticResource SystemFillColorSuccessBackground}" />
-    <SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="{StaticResource SystemFillColorAttentionBackground}" />
-
-    <SolidColorBrush x:Key="InfoBarErrorSeverityIconBackground" Color="{StaticResource SystemFillColorCritical}" />
-    <SolidColorBrush x:Key="InfoBarWarningSeverityIconBackground" Color="{StaticResource SystemFillColorCaution}" />
-    <SolidColorBrush x:Key="InfoBarSuccessSeverityIconBackground" Color="{StaticResource SystemFillColorSuccess}" />
-    <SolidColorBrush x:Key="InfoBarInformationalSeverityIconBackground" Color="{DynamicResource SystemAccentColorPrimary}" />
+    <SolidColorBrush x:Key="InfoBarBorderBrush"
+                     Color="{StaticResource CardStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="InfoBarTitleForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+
+    <SolidColorBrush x:Key="InfoBarErrorSeverityBackgroundBrush"
+                     Color="{StaticResource SystemFillColorCriticalBackground}"
+                     />
+    <SolidColorBrush x:Key="InfoBarWarningSeverityBackgroundBrush"
+                     Color="{StaticResource SystemFillColorCautionBackground}"
+                     />
+    <SolidColorBrush x:Key="InfoBarSuccessSeverityBackgroundBrush"
+                     Color="{StaticResource SystemFillColorSuccessBackground}"
+                     />
+    <SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush"
+                     Color="{StaticResource SystemFillColorAttentionBackground}"
+                     />
+
+    <SolidColorBrush x:Key="InfoBarErrorSeverityIconBackground"
+                     Color="{StaticResource SystemFillColorCritical}"
+                     />
+    <SolidColorBrush x:Key="InfoBarWarningSeverityIconBackground"
+                     Color="{StaticResource SystemFillColorCaution}"
+                     />
+    <SolidColorBrush x:Key="InfoBarSuccessSeverityIconBackground"
+                     Color="{StaticResource SystemFillColorSuccess}"
+                     />
+    <SolidColorBrush x:Key="InfoBarInformationalSeverityIconBackground"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
 
     <!--  Label  -->
-    <SolidColorBrush x:Key="LabelForeground" Color="{StaticResource TextFillColorSecondary}" />
+    <SolidColorBrush x:Key="LabelForeground"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
 
     <!--  ListBox  -->
-    <SolidColorBrush x:Key="ListBoxItemForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="{StaticResource TextOnAccentFillColorPrimary}" />
+    <SolidColorBrush x:Key="ListBoxItemForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush"
+                     Color="{StaticResource TextOnAccentFillColorPrimary}"
+                     />
 
     <!--  ListView  -->
-    <SolidColorBrush x:Key="ListViewItemForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="ListViewItemPillFillBrush" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
+    <SolidColorBrush x:Key="ListViewItemForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ListViewItemPillFillBrush"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver"
+                     Color="{StaticResource SubtleFillColorSecondary}"
+                     />
 
     <!--  LoadingScreen  -->
-    <SolidColorBrush x:Key="LoadingScreenBackground" Color="{StaticResource ApplicationBackgroundColor}" />
-    <SolidColorBrush x:Key="LoadingScreenForeground" Color="{StaticResource TextFillColorPrimary}" />
+    <SolidColorBrush x:Key="LoadingScreenBackground"
+                     Color="{StaticResource ApplicationBackgroundColor}"
+                     />
+    <SolidColorBrush x:Key="LoadingScreenForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
 
     <!--  Menu  -->
-    <SolidColorBrush x:Key="MenuBarBackground" Color="{StaticResource SubtleFillColorTransparent}" />
-    <SolidColorBrush x:Key="MenuBarItemBackgroundSelected" Color="{StaticResource SubtleFillColorTertiary}" />
-    <SolidColorBrush x:Key="MenuBarItemBorderBrush" Color="{StaticResource ControlAltFillColorTertiary}" />
+    <SolidColorBrush x:Key="MenuBarBackground"
+                     Color="{StaticResource SubtleFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="MenuBarItemBackgroundSelected"
+                     Color="{StaticResource SubtleFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="MenuBarItemBorderBrush"
+                     Color="{StaticResource ControlAltFillColorTertiary}"
+                     />
 
     <!--  MessageDialog  -->
-    <SolidColorBrush x:Key="MessageBoxBackground" Color="{StaticResource SolidBackgroundFillColorBase}" />
-    <SolidColorBrush x:Key="MessageBoxForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="MessageBoxSeparatorBorderBrush" Color="{StaticResource CardStrokeColorDefault}" />
-    <SolidColorBrush x:Key="MessageBoxTopOverlay" Color="{StaticResource LayerFillColorAlt}" />
+    <SolidColorBrush x:Key="MessageBoxBackground"
+                     Color="{StaticResource SolidBackgroundFillColorBase}"
+                     />
+    <SolidColorBrush x:Key="MessageBoxForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="MessageBoxSeparatorBorderBrush"
+                     Color="{StaticResource CardStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="MessageBoxTopOverlay"
+                     Color="{StaticResource LayerFillColorAlt}"
+                     />
 
     <!--  NavigationView  -->
-    <SolidColorBrush x:Key="NavigationViewItemForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="NavigationViewItemForegroundPointerOver" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="NavigationViewItemForegroundPressed" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="NavigationViewSelectionIndicatorForeground" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="NavigationViewItemSeparatorForeground" Color="{StaticResource DividerStrokeColorDefault}" />
-    <SolidColorBrush x:Key="NavigationViewItemBackground" Color="{StaticResource SubtleFillColorTransparent}" />
-    <SolidColorBrush x:Key="NavigationViewItemBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
-    <SolidColorBrush x:Key="NavigationViewItemBackgroundSelected" Color="{StaticResource SubtleFillColorSecondary}" />
-    <SolidColorBrush x:Key="NavigationViewItemBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
-    <SolidColorBrush x:Key="NavigationViewItemBorderBrush" Color="{StaticResource SubtleFillColorTransparent}" />
-
-    <SolidColorBrush x:Key="NavigationViewContentBackground" Color="{StaticResource LayerFillColorDefault}" />
-    <SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="{StaticResource CardStrokeColorDefault}" />
-
-    <SolidColorBrush x:Key="NavigationViewItemBackgroundSelectedLeftFluent" Color="{StaticResource ControlFillColorDefault}" />
-    <SolidColorBrush x:Key="NavigationViewItemForegroundLeftFluent" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="NavigationViewItemForegroundPointerOverLeftFluent" Color="{StaticResource TextFillColorPrimary}" />
+    <SolidColorBrush x:Key="NavigationViewItemForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="NavigationViewItemForegroundPointerOver"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="NavigationViewItemForegroundPressed"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="NavigationViewSelectionIndicatorForeground"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="NavigationViewItemSeparatorForeground"
+                     Color="{StaticResource DividerStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="NavigationViewItemBackground"
+                     Color="{StaticResource SubtleFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="NavigationViewItemBackgroundPointerOver"
+                     Color="{StaticResource SubtleFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="NavigationViewItemBackgroundSelected"
+                     Color="{StaticResource SubtleFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="NavigationViewItemBackgroundPressed"
+                     Color="{StaticResource SubtleFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="NavigationViewItemBorderBrush"
+                     Color="{StaticResource SubtleFillColorTransparent}"
+                     />
+
+    <SolidColorBrush x:Key="NavigationViewContentBackground"
+                     Color="{StaticResource LayerFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="NavigationViewContentGridBorderBrush"
+                     Color="{StaticResource CardStrokeColorDefault}"
+                     />
+
+    <SolidColorBrush x:Key="NavigationViewItemBackgroundSelectedLeftFluent"
+                     Color="{StaticResource ControlFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="NavigationViewItemForegroundLeftFluent"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="NavigationViewItemForegroundPointerOverLeftFluent"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
 
     <!--  ProgressBar  -->
-    <SolidColorBrush x:Key="ProgressBarForeground" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="ProgressBarBackground" Color="{StaticResource ControlStrongStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ProgressBarBorderBrush" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ProgressBarIndeterminateBackground" Color="{DynamicResource ControlFillColorTransparent}" />
+    <SolidColorBrush x:Key="ProgressBarForeground"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ProgressBarBackground"
+                     Color="{StaticResource ControlStrongStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ProgressBarBorderBrush"
+                     Color="{StaticResource ControlStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ProgressBarIndeterminateBackground"
+                     Color="{DynamicResource ControlFillColorTransparent}"
+                     />
 
     <!--  ProgressRing  -->
-    <SolidColorBrush x:Key="ProgressRingForegroundThemeBrush" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="ProgressRingBackgroundThemeBrush" Color="{StaticResource ControlFillColorTransparent}" />
+    <SolidColorBrush x:Key="ProgressRingForegroundThemeBrush"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ProgressRingBackgroundThemeBrush"
+                     Color="{StaticResource ControlFillColorTransparent}"
+                     />
 
     <!--  RadioButton  -->
-    <SolidColorBrush x:Key="RadioButtonForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="RadioButtonForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
-    <SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStroke" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" Color="{DynamicResource SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="RadioButtonOuterEllipseFill" Color="{StaticResource ControlAltFillColorSecondary}" />
-    <SolidColorBrush x:Key="RadioButtonOuterEllipseFillPointerOver" Color="{StaticResource ControlAltFillColorTertiary}" />
-    <SolidColorBrush x:Key="RadioButtonOuterEllipseFillPressed" Color="{StaticResource ControlAltFillColorQuarternary}" />
-    <SolidColorBrush x:Key="RadioButtonOuterEllipseFillDisabled" Color="{StaticResource ControlAltFillColorDisabled}" />
-    <SolidColorBrush x:Key="RadioButtonOuterEllipseStroke" Color="{StaticResource ControlStrongStrokeColorDefault}" />
-    <SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePressed" Color="{StaticResource ControlStrongStrokeColorDisabled}" />
-    <SolidColorBrush x:Key="RadioButtonOuterEllipseStrokeDisabled" Color="{StaticResource ControlStrongStrokeColorDisabled}" />
+    <SolidColorBrush x:Key="RadioButtonForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="RadioButtonForegroundDisabled"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStroke"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver"
+                     Color="{DynamicResource SystemAccentColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="RadioButtonCheckGlyphFill"
+                     Color="{StaticResource TextOnAccentFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="RadioButtonOuterEllipseFill"
+                     Color="{StaticResource ControlAltFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="RadioButtonOuterEllipseFillPointerOver"
+                     Color="{StaticResource ControlAltFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="RadioButtonOuterEllipseFillPressed"
+                     Color="{StaticResource ControlAltFillColorQuarternary}"
+                     />
+    <SolidColorBrush x:Key="RadioButtonOuterEllipseFillDisabled"
+                     Color="{StaticResource ControlAltFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="RadioButtonOuterEllipseStroke"
+                     Color="{StaticResource ControlStrongStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePressed"
+                     Color="{StaticResource ControlStrongStrokeColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="RadioButtonOuterEllipseStrokeDisabled"
+                     Color="{StaticResource ControlStrongStrokeColorDisabled}"
+                     />
 
     <!--  RatingControl  -->
-    <SolidColorBrush x:Key="RatingControlSelectedForeground" Color="{DynamicResource SystemAccentColorPrimary}" />
+    <SolidColorBrush x:Key="RatingControlSelectedForeground"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
 
     <!--  Separator  -->
-    <SolidColorBrush x:Key="SeparatorBorderBrush" Color="{StaticResource DividerStrokeColorDefault}" />
+    <SolidColorBrush x:Key="SeparatorBorderBrush"
+                     Color="{StaticResource DividerStrokeColorDefault}"
+                     />
 
     <!--  Slider  -->
-    <SolidColorBrush x:Key="SliderTrackFill" Color="{StaticResource ControlStrongFillColorDefault}" />
-    <SolidColorBrush x:Key="SliderTrackFillPointerOver" Color="{StaticResource ControlStrongFillColorDefault}" />
-    <SolidColorBrush x:Key="SliderTickBarFill" Color="{StaticResource ControlStrongFillColorDefault}" />
-    <SolidColorBrush x:Key="SliderOuterThumbBackground" Color="{StaticResource ControlSolidFillColorDefault}" />
-    <SolidColorBrush x:Key="SliderThumbBackground" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="SliderThumbBackgroundPointerOver" Color="{DynamicResource SystemAccentColorSecondary}" />
+    <SolidColorBrush x:Key="SliderTrackFill"
+                     Color="{StaticResource ControlStrongFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="SliderTrackFillPointerOver"
+                     Color="{StaticResource ControlStrongFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="SliderTickBarFill"
+                     Color="{StaticResource ControlStrongFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="SliderOuterThumbBackground"
+                     Color="{StaticResource ControlSolidFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="SliderThumbBackground"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="SliderThumbBackgroundPointerOver"
+                     Color="{DynamicResource SystemAccentColorSecondary}"
+                     />
 
     <!--  SnackBar  -->
-    <SolidColorBrush x:Key="SnackBarBackground" Color="{StaticResource AcrylicBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="SnackBarForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="SnackBarBorderBrush" Color="{StaticResource SurfaceStrokeColorFlyout}" />
+    <SolidColorBrush x:Key="SnackBarBackground"
+                     Color="{StaticResource AcrylicBackgroundFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="SnackBarForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="SnackBarBorderBrush"
+                     Color="{StaticResource SurfaceStrokeColorFlyout}"
+                     />
 
     <!--  StatusBar  -->
     <!--  TO DO  -->
 
     <!--  TabControl / TabView  -->
-    <SolidColorBrush x:Key="TabViewBackground" Color="{StaticResource SubtleFillColorTransparent}" />
-    <SolidColorBrush x:Key="TabViewForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="TabViewItemForegroundSelected" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="TabViewBorderBrush" Color="{StaticResource CardStrokeColorDefault}" />
-    <SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource LayerOnMicaBaseAltFillColorTransparent}" />
-    <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
-    <SolidColorBrush x:Key="TabViewSelectedItemBorderBrush" Color="{StaticResource CardStrokeColorDefault}" />
+    <SolidColorBrush x:Key="TabViewBackground"
+                     Color="{StaticResource SubtleFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="TabViewForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="TabViewItemForegroundSelected"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="TabViewBorderBrush"
+                     Color="{StaticResource CardStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="TabViewItemHeaderBackground"
+                     Color="{StaticResource LayerOnMicaBaseAltFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected"
+                     Color="{StaticResource SolidBackgroundFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="TabViewSelectedItemBorderBrush"
+                     Color="{StaticResource CardStrokeColorDefault}"
+                     />
 
     <!--  TextBox (same brushes are used for AutoSuggestBox / NumberBox / PasswordBox / RichSuggestBox)  -->
-    <SolidColorBrush x:Key="TextControlBackground" Color="{StaticResource ControlFillColorDefault}" />
-    <SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="{StaticResource ControlFillColorSecondary}" />
-    <SolidColorBrush x:Key="TextControlBackgroundFocused" Color="{StaticResource ControlFillColorInputActive}" />
-    <SolidColorBrush x:Key="TextControlBackgroundDisabled" Color="{StaticResource ControlFillColorDisabled}" />
+    <SolidColorBrush x:Key="TextControlBackground"
+                     Color="{StaticResource ControlFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="TextControlBackgroundPointerOver"
+                     Color="{StaticResource ControlFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="TextControlBackgroundFocused"
+                     Color="{StaticResource ControlFillColorInputActive}"
+                     />
+    <SolidColorBrush x:Key="TextControlBackgroundDisabled"
+                     Color="{StaticResource ControlFillColorDisabled}"
+                     />
     <!--<SolidColorBrush x:Key="TextControlBorderBrush" Color="{StaticResource TextControlElevationBorderBrush}" />-->
-    <SolidColorBrush x:Key="TextControlForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="TextControlForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
-    <SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
+    <SolidColorBrush x:Key="TextControlForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="TextControlForegroundDisabled"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="TextControlFocusedBorderBrush"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="TextControlBorderBrushDisabled"
+                     Color="{StaticResource ControlStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="TextControlPlaceholderForeground"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="TextControlButtonForeground"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
 
     <!--  ThumbRate  -->
-    <SolidColorBrush x:Key="ThumbRateForeground" Color="{DynamicResource SystemAccentColorPrimary}" />
+    <SolidColorBrush x:Key="ThumbRateForeground"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
 
     <!--  TimePicker  -->
-    <SolidColorBrush x:Key="TimePickerButtonBackground" Color="{StaticResource ControlFillColorTertiary}" />
-    <SolidColorBrush x:Key="TimePickerButtonBackgroundPointerOver" Color="{StaticResource ControlFillColorSecondary}" />
-    <SolidColorBrush x:Key="TimePickerButtonBackgroundPressed" Color="{StaticResource ControlFillColorTertiary}" />
-    <SolidColorBrush x:Key="TimePickerButtonBackgroundDisabled" Color="{StaticResource ControlFillColorDisabled}" />
+    <SolidColorBrush x:Key="TimePickerButtonBackground"
+                     Color="{StaticResource ControlFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="TimePickerButtonBackgroundPointerOver"
+                     Color="{StaticResource ControlFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="TimePickerButtonBackgroundPressed"
+                     Color="{StaticResource ControlFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="TimePickerButtonBackgroundDisabled"
+                     Color="{StaticResource ControlFillColorDisabled}"
+                     />
     <!--<SolidColorBrush x:Key="TimePickerButtonBorderBrush" Color="{StaticResource ControlElevationBorderBrush}" />-->
-    <SolidColorBrush x:Key="TimePickerButtonBorderBrushPressed" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="TimePickerButtonBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="TimePickerButtonForegroundDefault" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="TimePickerButtonForegroundPointerOver" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="TimePickerButtonForegroundPressed" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="TimePickerButtonForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
+    <SolidColorBrush x:Key="TimePickerButtonBorderBrushPressed"
+                     Color="{StaticResource ControlStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="TimePickerButtonBorderBrushDisabled"
+                     Color="{StaticResource ControlStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="TimePickerButtonForegroundDefault"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="TimePickerButtonForegroundPointerOver"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="TimePickerButtonForegroundPressed"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="TimePickerButtonForegroundDisabled"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
 
     <!--  ToggleButton  -->
-    <SolidColorBrush x:Key="ToggleButtonBackground" Color="{StaticResource ControlFillColorDefault}" />
-    <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver" Color="{StaticResource ControlFillColorSecondary}" />
-    <SolidColorBrush x:Key="ToggleButtonBackgroundPressed" Color="{StaticResource ControlFillColorTertiary}" />
-    <SolidColorBrush x:Key="ToggleButtonBackgroundDisabled" Color="{StaticResource ControlFillColorDisabled}" />
-    <SolidColorBrush x:Key="ToggleButtonBackgroundChecked" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver" Color="{DynamicResource SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="{DynamicResource SystemAccentColorTertiary}" />
-    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedDisabled" Color="{StaticResource AccentFillColorDisabled}" />
+    <SolidColorBrush x:Key="ToggleButtonBackground"
+                     Color="{StaticResource ControlFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver"
+                     Color="{StaticResource ControlFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonBackgroundPressed"
+                     Color="{StaticResource ControlFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonBackgroundDisabled"
+                     Color="{StaticResource ControlFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver"
+                     Color="{DynamicResource SystemAccentColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"
+                     Color="{DynamicResource SystemAccentColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedDisabled"
+                     Color="{StaticResource AccentFillColorDisabled}"
+                     />
     <!--<SolidColorBrush x:Key="ToggleButtonBorderBrush" Color="{StaticResource ControlElevationBorderBrush}" />-->
-    <SolidColorBrush x:Key="ToggleButtonBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ToggleButtonBorderBrushPressed" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed" Color="{StaticResource ControlFillColorTransparent}" />
-    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedDisabled" Color="{StaticResource ControlFillColorTransparent}" />
-    <SolidColorBrush x:Key="ToggleButtonForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="ToggleButtonForegroundPressed" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="ToggleButtonForegroundChecked" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="ToggleButtonForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
-    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed" Color="{StaticResource TextOnAccentFillColorSecondary}" />
-    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedDisabled" Color="{StaticResource TextOnAccentFillColorDisabled}" />
+    <SolidColorBrush x:Key="ToggleButtonBorderBrushDisabled"
+                     Color="{StaticResource ControlStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonBorderBrushPressed"
+                     Color="{StaticResource ControlStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed"
+                     Color="{StaticResource ControlFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedDisabled"
+                     Color="{StaticResource ControlFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonForegroundPressed"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonForegroundChecked"
+                     Color="{StaticResource TextOnAccentFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonForegroundDisabled"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed"
+                     Color="{StaticResource TextOnAccentFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedDisabled"
+                     Color="{StaticResource TextOnAccentFillColorDisabled}"
+                     />
 
     <!--  ToggleSwitch  -->
-    <SolidColorBrush x:Key="ToggleSwitchContentForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="ToggleSwitchContentForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOff" Color="{StaticResource ControlStrongStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOffPointerOver" Color="{StaticResource ControlStrongStrokeColorDefault}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOffDisabled" Color="{StaticResource ControlStrongStrokeColorDisabled}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOn" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOnPointerOver" Color="{DynamicResource SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="ToggleSwitchStrokeOnDisabled" Color="{StaticResource AccentFillColorDisabled}" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOn" Color="{DynamicResource SystemAccentColorPrimary}" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOnPointerOver" Color="{DynamicResource SystemAccentColorSecondary}" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOnDisabled" Color="{StaticResource AccentFillColorDisabled}" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOff" Color="{StaticResource ControlAltFillColorSecondary}" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOffPointerOver" Color="{StaticResource ControlAltFillColorTertiary}" />
-    <SolidColorBrush x:Key="ToggleSwitchFillOffDisabled" Color="{StaticResource ControlAltFillColorDisabled}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOff" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOffPointerOver" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOffPressed" Color="{StaticResource TextFillColorSecondary}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOffDisabled" Color="{StaticResource TextFillColorDisabled}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOn" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOnPointerOver" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOnPressed" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-    <SolidColorBrush x:Key="ToggleSwitchKnobFillOnDisabled" Color="{StaticResource TextOnAccentFillColorDisabled}" />
+    <SolidColorBrush x:Key="ToggleSwitchContentForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchContentForegroundDisabled"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchStrokeOff"
+                     Color="{StaticResource ControlStrongStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchStrokeOffPointerOver"
+                     Color="{StaticResource ControlStrongStrokeColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchStrokeOffDisabled"
+                     Color="{StaticResource ControlStrongStrokeColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchStrokeOn"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchStrokeOnPointerOver"
+                     Color="{DynamicResource SystemAccentColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchStrokeOnDisabled"
+                     Color="{StaticResource AccentFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchFillOn"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchFillOnPointerOver"
+                     Color="{DynamicResource SystemAccentColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchFillOnDisabled"
+                     Color="{StaticResource AccentFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchFillOff"
+                     Color="{StaticResource ControlAltFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchFillOffPointerOver"
+                     Color="{StaticResource ControlAltFillColorTertiary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchFillOffDisabled"
+                     Color="{StaticResource ControlAltFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchKnobFillOff"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchKnobFillOffPointerOver"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchKnobFillOffPressed"
+                     Color="{StaticResource TextFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchKnobFillOffDisabled"
+                     Color="{StaticResource TextFillColorDisabled}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchKnobFillOn"
+                     Color="{StaticResource TextOnAccentFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchKnobFillOnPointerOver"
+                     Color="{StaticResource TextOnAccentFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchKnobFillOnPressed"
+                     Color="{StaticResource TextOnAccentFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="ToggleSwitchKnobFillOnDisabled"
+                     Color="{StaticResource TextOnAccentFillColorDisabled}"
+                     />
 
     <!--  ToolTip  -->
-    <SolidColorBrush x:Key="ToolTipBackground" Color="{StaticResource AcrylicBackgroundFillColorDefault}" />
-    <SolidColorBrush x:Key="ToolTipBorderBrush" Color="{StaticResource SurfaceStrokeColorFlyout}" />
-    <SolidColorBrush x:Key="ToolTipForeground" Color="{StaticResource TextFillColorPrimary}" />
+    <SolidColorBrush x:Key="ToolTipBackground"
+                     Color="{StaticResource AcrylicBackgroundFillColorDefault}"
+                     />
+    <SolidColorBrush x:Key="ToolTipBorderBrush"
+                     Color="{StaticResource SurfaceStrokeColorFlyout}"
+                     />
+    <SolidColorBrush x:Key="ToolTipForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
 
     <!--  ToolBar  -->
     <!--  TODO  -->
@@ -670,9 +1332,19 @@
     <!--  TODO  -->
 
     <!--  TreeView  -->
-    <SolidColorBrush x:Key="TreeViewItemBackground" Color="{StaticResource SubtleFillColorTransparent}" />
-    <SolidColorBrush x:Key="TreeViewItemBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
-    <SolidColorBrush x:Key="TreeViewItemBackgroundSelected" Color="{StaticResource SubtleFillColorSecondary}" />
-    <SolidColorBrush x:Key="TreeViewItemForeground" Color="{StaticResource TextFillColorPrimary}" />
-    <SolidColorBrush x:Key="TreeViewItemSelectionIndicatorForeground" Color="{DynamicResource SystemAccentColorPrimary}" />
+    <SolidColorBrush x:Key="TreeViewItemBackground"
+                     Color="{StaticResource SubtleFillColorTransparent}"
+                     />
+    <SolidColorBrush x:Key="TreeViewItemBackgroundPointerOver"
+                     Color="{StaticResource SubtleFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="TreeViewItemBackgroundSelected"
+                     Color="{StaticResource SubtleFillColorSecondary}"
+                     />
+    <SolidColorBrush x:Key="TreeViewItemForeground"
+                     Color="{StaticResource TextFillColorPrimary}"
+                     />
+    <SolidColorBrush x:Key="TreeViewItemSelectionIndicatorForeground"
+                     Color="{DynamicResource SystemAccentColorPrimary}"
+                     />
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Resources/Typography.xaml b/src/Wpf.Ui/Resources/Typography.xaml
index 6d8337367..2358a60e3 100644
--- a/src/Wpf.Ui/Resources/Typography.xaml
+++ b/src/Wpf.Ui/Resources/Typography.xaml
@@ -1,72 +1,74 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    >
 
     <Style TargetType="TextBlock">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="LineHeight" Value="20" />
-        <Setter Property="FontWeight" Value="Regular" />
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="LineHeight" Value="20"/>
+        <Setter Property="FontWeight" Value="Regular"/>
     </Style>
 
-    <Style
-        x:Key="CaptionTextBlockStyle"
-        BasedOn="{StaticResource {x:Type TextBlock}}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="LineHeight" Value="16" />
-        <Setter Property="FontWeight" Value="Regular" />
+    <Style x:Key="CaptionTextBlockStyle"
+           BasedOn="{StaticResource {x:Type TextBlock}}"
+           TargetType="{x:Type TextBlock}"
+           >
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="LineHeight" Value="16"/>
+        <Setter Property="FontWeight" Value="Regular"/>
     </Style>
 
-    <Style
-        x:Key="BodyTextBlockStyle"
-        BasedOn="{StaticResource {x:Type TextBlock}}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="LineHeight" Value="20" />
-        <Setter Property="FontWeight" Value="Regular" />
+    <Style x:Key="BodyTextBlockStyle"
+           BasedOn="{StaticResource {x:Type TextBlock}}"
+           TargetType="{x:Type TextBlock}"
+           >
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="LineHeight" Value="20"/>
+        <Setter Property="FontWeight" Value="Regular"/>
     </Style>
 
-    <Style
-        x:Key="BodyStrongTextBlockStyle"
-        BasedOn="{StaticResource {x:Type TextBlock}}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="LineHeight" Value="20" />
-        <Setter Property="FontWeight" Value="SemiBold" />
+    <Style x:Key="BodyStrongTextBlockStyle"
+           BasedOn="{StaticResource {x:Type TextBlock}}"
+           TargetType="{x:Type TextBlock}"
+           >
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="LineHeight" Value="20"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
     </Style>
 
-    <Style
-        x:Key="SubtitleTextBlockStyle"
-        BasedOn="{StaticResource {x:Type TextBlock}}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="20" />
-        <Setter Property="LineHeight" Value="28" />
-        <Setter Property="FontWeight" Value="SemiBold" />
+    <Style x:Key="SubtitleTextBlockStyle"
+           BasedOn="{StaticResource {x:Type TextBlock}}"
+           TargetType="{x:Type TextBlock}"
+           >
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="LineHeight" Value="28"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
     </Style>
 
-    <Style
-        x:Key="TitleTextBlockStyle"
-        BasedOn="{StaticResource {x:Type TextBlock}}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="28" />
-        <Setter Property="LineHeight" Value="36" />
-        <Setter Property="FontWeight" Value="SemiBold" />
+    <Style x:Key="TitleTextBlockStyle"
+           BasedOn="{StaticResource {x:Type TextBlock}}"
+           TargetType="{x:Type TextBlock}"
+           >
+        <Setter Property="FontSize" Value="28"/>
+        <Setter Property="LineHeight" Value="36"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
     </Style>
 
-    <Style
-        x:Key="TitleLargeTextBlockStyle"
-        BasedOn="{StaticResource {x:Type TextBlock}}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="40" />
-        <Setter Property="LineHeight" Value="52" />
-        <Setter Property="FontWeight" Value="SemiBold" />
+    <Style x:Key="TitleLargeTextBlockStyle"
+           BasedOn="{StaticResource {x:Type TextBlock}}"
+           TargetType="{x:Type TextBlock}"
+           >
+        <Setter Property="FontSize" Value="40"/>
+        <Setter Property="LineHeight" Value="52"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
     </Style>
 
-    <Style
-        x:Key="DisplayTextBlockStyle"
-        BasedOn="{StaticResource {x:Type TextBlock}}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="68" />
-        <Setter Property="LineHeight" Value="92" />
-        <Setter Property="FontWeight" Value="SemiBold" />
+    <Style x:Key="DisplayTextBlockStyle"
+           BasedOn="{StaticResource {x:Type TextBlock}}"
+           TargetType="{x:Type TextBlock}"
+           >
+        <Setter Property="FontSize" Value="68"/>
+        <Setter Property="LineHeight" Value="92"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Resources/Variables.xaml b/src/Wpf.Ui/Resources/Variables.xaml
index 45a927342..767369b56 100644
--- a/src/Wpf.Ui/Resources/Variables.xaml
+++ b/src/Wpf.Ui/Resources/Variables.xaml
@@ -7,10 +7,10 @@
     Based on Microsoft XAML for Win UI
     Copyright (c) Microsoft Corporation. All Rights Reserved.
 -->
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                    >
 
     <system:Double x:Key="DefaultIconFontSize">16</system:Double>
 
diff --git a/src/Wpf.Ui/Resources/Wpf.Ui.xaml b/src/Wpf.Ui/Resources/Wpf.Ui.xaml
index b52f501d3..44168b591 100644
--- a/src/Wpf.Ui/Resources/Wpf.Ui.xaml
+++ b/src/Wpf.Ui/Resources/Wpf.Ui.xaml
@@ -6,97 +6,97 @@
 -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/Variables.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/Fonts.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/Typography.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/StaticColors.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/Accent.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/Palette.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/DefaultContextMenu.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/DefaultFocusVisualStyle.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/DefaultTextBoxScrollViewerStyle.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/Variables.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/Fonts.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/Typography.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/StaticColors.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/Accent.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/Palette.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/DefaultContextMenu.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/DefaultFocusVisualStyle.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/DefaultTextBoxScrollViewerStyle.xaml"/>
 
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/AccessText/AccessText.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Anchor/Anchor.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/AutoSuggestBox/AutoSuggestBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Badge/Badge.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/BreadcrumbBar/BreadcrumbBar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Button/Button.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Calendar/Calendar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CalendarDatePicker/CalendarDatePicker.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Card/Card.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CardAction/CardAction.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CardColor/CardColor.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CardControl/CardControl.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CardExpander/CardExpander.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CheckBox/CheckBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CheckBox/CheckBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ColorPicker/ColorPicker.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ComboBox/ComboBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ContentDialog/ContentDialog.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ContextMenu/ContextMenu.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ContextMenu/ContextMenuLoader.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/DataGrid/DataGrid.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/DatePicker/DatePicker.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/DropDownButton/DropDownButton.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/DynamicScrollBar/DynamicScrollBar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/DynamicScrollViewer/DynamicScrollViewer.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Expander/Expander.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/FluentWindow/FluentWindow.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Flyout/Flyout.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Frame/Frame.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/GridView/GridViewColumnHeader.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/HyperlinkButton/HyperlinkButton.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Image/Image.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/InfoBar/InfoBar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/InfoBadge/InfoBadge.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ItemsControl/ItemsControl.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Label/Label.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ListBox/ListBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ListBox/ListBoxItem.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ListView/ListView.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ListView/ListViewItem.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/LoadingScreen/LoadingScreen.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Menu/Menu.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Menu/MenuItem.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Menu/MenuLoader.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/MessageBox/MessageBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationView.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewBreadcrumbItem.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewContentPresenter.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewItemHeader.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewItemSeparator.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NumberBox/NumberBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Page/Page.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/PasswordBox/PasswordBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ProgressBar/ProgressBar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ProgressRing/ProgressRing.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/RadioButton/RadioButton.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/RatingControl/RatingControl.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/RichTextBox/RichTextBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ScrollBar/ScrollBar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ScrollViewer/ScrollViewer.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Separator/Separator.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Slider/Slider.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Snackbar/Snackbar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/SplitButton/SplitButton.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/StatusBar/StatusBar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TabControl/TabControl.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TextBlock/TextBlock.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TextBox/TextBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ThumbRate/ThumbRate.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TitleBar/TitleBar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TimePicker/TimePicker.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ToggleButton/ToggleButton.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ToggleSwitch/ToggleSwitch.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ToolBar/ToolBar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ToolTip/ToolTip.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TreeGrid/TreeGrid.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TreeView/TreeView.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TreeView/TreeViewItem.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/VirtualizingGridView/VirtualizingGridView.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/VirtualizingItemsControl/VirtualizingItemsControl.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/VirtualizingWrapPanel/VirtualizingWrapPanel.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Window/Window.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/AccessText/AccessText.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Anchor/Anchor.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/AutoSuggestBox/AutoSuggestBox.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Badge/Badge.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/BreadcrumbBar/BreadcrumbBar.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Button/Button.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Calendar/Calendar.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CalendarDatePicker/CalendarDatePicker.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Card/Card.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CardAction/CardAction.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CardColor/CardColor.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CardControl/CardControl.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CardExpander/CardExpander.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CheckBox/CheckBox.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/CheckBox/CheckBox.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ColorPicker/ColorPicker.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ComboBox/ComboBox.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ContentDialog/ContentDialog.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ContextMenu/ContextMenu.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ContextMenu/ContextMenuLoader.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/DataGrid/DataGrid.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/DatePicker/DatePicker.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/DropDownButton/DropDownButton.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/DynamicScrollBar/DynamicScrollBar.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/DynamicScrollViewer/DynamicScrollViewer.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Expander/Expander.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/FluentWindow/FluentWindow.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Flyout/Flyout.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Frame/Frame.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/GridView/GridViewColumnHeader.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/HyperlinkButton/HyperlinkButton.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Image/Image.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/InfoBar/InfoBar.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/InfoBadge/InfoBadge.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ItemsControl/ItemsControl.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Label/Label.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ListBox/ListBox.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ListBox/ListBoxItem.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ListView/ListView.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ListView/ListViewItem.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/LoadingScreen/LoadingScreen.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Menu/Menu.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Menu/MenuItem.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Menu/MenuLoader.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/MessageBox/MessageBox.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationView.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewBreadcrumbItem.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewContentPresenter.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewItemHeader.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewItemSeparator.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NumberBox/NumberBox.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Page/Page.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/PasswordBox/PasswordBox.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ProgressBar/ProgressBar.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ProgressRing/ProgressRing.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/RadioButton/RadioButton.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/RatingControl/RatingControl.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/RichTextBox/RichTextBox.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ScrollBar/ScrollBar.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ScrollViewer/ScrollViewer.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Separator/Separator.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Slider/Slider.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Snackbar/Snackbar.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/SplitButton/SplitButton.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/StatusBar/StatusBar.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TabControl/TabControl.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TextBlock/TextBlock.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TextBox/TextBox.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ThumbRate/ThumbRate.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TitleBar/TitleBar.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TimePicker/TimePicker.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ToggleButton/ToggleButton.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ToggleSwitch/ToggleSwitch.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ToolBar/ToolBar.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/ToolTip/ToolTip.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TreeGrid/TreeGrid.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TreeView/TreeView.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TreeView/TreeViewItem.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/VirtualizingGridView/VirtualizingGridView.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/VirtualizingItemsControl/VirtualizingItemsControl.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/VirtualizingWrapPanel/VirtualizingWrapPanel.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Window/Window.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

From 12d2818be0abda0da261f66b592157299a735fc6 Mon Sep 17 00:00:00 2001
From: mOlDaViA <crayzyone@gmail.com>
Date: Thu, 27 Jun 2024 02:16:50 +0200
Subject: [PATCH 4/4] Forgot you had a seperate place for converters, so the
 SliderThumbPositionConverter is now in the right place.

---
 src/Wpf.Ui/Controls/Slider/Slider.xaml                       | 4 ++--
 .../Slider => Converters}/SliderThumbPositionConverter.cs    | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename src/Wpf.Ui/{Controls/Slider => Converters}/SliderThumbPositionConverter.cs (81%)

diff --git a/src/Wpf.Ui/Controls/Slider/Slider.xaml b/src/Wpf.Ui/Controls/Slider/Slider.xaml
index d5a742daf..e3bff3004 100644
--- a/src/Wpf.Ui/Controls/Slider/Slider.xaml
+++ b/src/Wpf.Ui/Controls/Slider/Slider.xaml
@@ -7,9 +7,9 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+                    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
                     >
-    <controls:SliderThumbPositionConverter x:Key="SliderThumbPositionConverter"/>
+    <converters:SliderThumbPositionConverter x:Key="SliderThumbPositionConverter"/>
 
     <Style x:Key="UiSliderButtonStyle"
            TargetType="{x:Type RepeatButton}"
diff --git a/src/Wpf.Ui/Controls/Slider/SliderThumbPositionConverter.cs b/src/Wpf.Ui/Converters/SliderThumbPositionConverter.cs
similarity index 81%
rename from src/Wpf.Ui/Controls/Slider/SliderThumbPositionConverter.cs
rename to src/Wpf.Ui/Converters/SliderThumbPositionConverter.cs
index 40c1d441f..4a021a4b5 100644
--- a/src/Wpf.Ui/Controls/Slider/SliderThumbPositionConverter.cs
+++ b/src/Wpf.Ui/Converters/SliderThumbPositionConverter.cs
@@ -1,9 +1,8 @@
 using System.Windows.Data;
 
-// ReSharper disable once CheckNamespace
-namespace Wpf.Ui.Controls;
+namespace Wpf.Ui.Converters;
 
-public class SliderThumbPositionConverter : IMultiValueConverter
+internal class SliderThumbPositionConverter : IMultiValueConverter
 {
     public object Convert(object[]? values, Type targetType, object parameter, CultureInfo culture)
     {