From 5d669df21a756f4381c0e0400917b45992fdb6bd Mon Sep 17 00:00:00 2001
From: Davide Giacometti <davide.giacometti@outlook.it>
Date: Wed, 11 Oct 2023 12:34:06 +0200
Subject: [PATCH] [FancyZonesEditor] XamlStyler formatting (#29126)

---
 .pipelines/applyXamlStyling.ps1               |    2 +-
 .../editor/FancyZonesEditor/App.xaml          |   17 +-
 .../editor/FancyZonesEditor/CanvasEditor.xaml |   18 +-
 .../FancyZonesEditor/CanvasEditorWindow.xaml  |  132 +-
 .../editor/FancyZonesEditor/CanvasZone.xaml   |  329 +++--
 .../ClickAutomationEventButton.xaml           |   19 +-
 .../Controls/CustomSlider.xaml                |   10 +-
 .../editor/FancyZonesEditor/GridEditor.xaml   |   43 +-
 .../FancyZonesEditor/GridEditorWindow.xaml    |   99 +-
 .../editor/FancyZonesEditor/GridResizer.xaml  |   67 +-
 .../editor/FancyZonesEditor/GridZone.xaml     |   28 +-
 .../FancyZonesEditor/LayoutOverlayWindow.xaml |   33 +-
 .../FancyZonesEditor/LayoutPreview.xaml       |   27 +-
 .../editor/FancyZonesEditor/MainWindow.xaml   | 1153 +++++++++--------
 .../FancyZonesEditor/Styles/ButtonStyles.xaml |  152 +--
 .../Styles/GridViewStyles.xaml                |  353 ++---
 .../Styles/LayoutPreviewStyles.xaml           |   15 +-
 .../editor/FancyZonesEditor/Themes/Dark.xaml  |   17 +-
 .../Themes/HighContrast1.xaml                 |    7 +-
 .../Themes/HighContrast2.xaml                 |    7 +-
 .../Themes/HighContrastBlack.xaml             |    7 +-
 .../Themes/HighContrastWhite.xaml             |    9 +-
 .../editor/FancyZonesEditor/Themes/Light.xaml |   17 +-
 23 files changed, 1312 insertions(+), 1249 deletions(-)

diff --git a/.pipelines/applyXamlStyling.ps1 b/.pipelines/applyXamlStyling.ps1
index 354abf351d..42e235f195 100644
--- a/.pipelines/applyXamlStyling.ps1
+++ b/.pipelines/applyXamlStyling.ps1
@@ -107,7 +107,7 @@ if (-not $Passive)
 else 
 {
     Write-Output "Checking all files (passively)"
-    $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\launcher\\PowerLauncher\\)|(\\launcher\\Wox.Plugin\\)|(\\colorPicker\\ColorPickerUI\\)|(\\editor\\FancyZonesEditor\\)|(\\settings-ui\\Settings.UI\\)" }
+    $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\launcher\\PowerLauncher\\)|(\\launcher\\Wox.Plugin\\)|(\\colorPicker\\ColorPickerUI\\)|(\\settings-ui\\Settings.UI\\)" }
 
     if ($files.count -gt 0)
     {
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/App.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/App.xaml
index 8c9e6461e9..59084b3ed6 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/App.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/App.xaml
@@ -1,10 +1,11 @@
-<Application x:Class="FancyZonesEditor.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:FancyZonesEditor"
-             xmlns:ui="http://schemas.modernwpf.com/2019"
-             Startup="OnStartup"
-             Exit="OnExit">
+<Application
+    x:Class="FancyZonesEditor.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:FancyZonesEditor"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
+    Exit="OnExit"
+    Startup="OnStartup">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -15,7 +16,7 @@
                 <ResourceDictionary Source="pack://application:,,,/Styles/LayoutPreviewStyles.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
-            <Style x:Key="HeadingTextBlock" TargetType="TextBlock"/>
+            <Style x:Key="HeadingTextBlock" TargetType="TextBlock" />
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditor.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditor.xaml
index a5969e6875..c79920f16c 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditor.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditor.xaml
@@ -1,13 +1,15 @@
-<UserControl x:Class="FancyZonesEditor.CanvasEditor"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
+<UserControl
+    x:Class="FancyZonesEditor.CanvasEditor"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="300"
+    d:DesignWidth="300"
+    mc:Ignorable="d">
     <Grid x:Name="Body">
         <Viewbox Stretch="Uniform">
-            <Canvas x:Name="Preview"/>
+            <Canvas x:Name="Preview" />
         </Viewbox>
     </Grid>
 </UserControl>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
index 1fcbf026be..9541ff53f5 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
@@ -1,57 +1,63 @@
-<local:EditorWindow x:Class="FancyZonesEditor.CanvasEditorWindow"
-                    AutomationProperties.Name="{x:Static props:Resources.Canvas_Layout_Editor}"
-                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:local="clr-namespace:FancyZonesEditor"
-                    xmlns:props="clr-namespace:FancyZonesEditor.Properties"
-                    mc:Ignorable="d"
-                    Title=""
-                    Height="196"
-                    MinWidth="360"
-                    BorderThickness="0"
-                    xmlns:ui="http://schemas.modernwpf.com/2019"
-                    ui:WindowHelper.UseModernWindowStyle="True"
-                    ui:TitleBar.IsIconVisible="False"
-                    SizeToContent="Width"
-                    Background="{DynamicResource PrimaryBackgroundBrush}"
-                    ResizeMode="NoResize"
-                    WindowStartupLocation="CenterOwner"
-                    ContentRendered="EditorWindow_ContentRendered"
-                    Closed="OnClosed">
+<local:EditorWindow
+    x:Class="FancyZonesEditor.CanvasEditorWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:FancyZonesEditor"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:props="clr-namespace:FancyZonesEditor.Properties"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
+    Title=""
+    Height="196"
+    MinWidth="360"
+    ui:TitleBar.IsIconVisible="False"
+    ui:WindowHelper.UseModernWindowStyle="True"
+    AutomationProperties.Name="{x:Static props:Resources.Canvas_Layout_Editor}"
+    Background="{DynamicResource PrimaryBackgroundBrush}"
+    BorderThickness="0"
+    Closed="OnClosed"
+    ContentRendered="EditorWindow_ContentRendered"
+    ResizeMode="NoResize"
+    SizeToContent="Width"
+    WindowStartupLocation="CenterOwner"
+    mc:Ignorable="d">
     <Grid Height="160">
-        <Grid Height="36"
-              Background="{DynamicResource SecondaryBackgroundBrush}"
-              Margin="0,-36,0,0"
-              VerticalAlignment="Top"
-              HorizontalAlignment="Stretch">
-            <Border Background="{DynamicResource TitleBarSecondaryForegroundBrush}"
-                    Width="30"
-                    Height="3"
-                    CornerRadius="1.5"
-                    VerticalAlignment="Center"
-                    Margin="0,4,0,0" />
+        <Grid
+            Height="36"
+            Margin="0,-36,0,0"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
+            Background="{DynamicResource SecondaryBackgroundBrush}">
+            <Border
+                Width="30"
+                Height="3"
+                Margin="0,4,0,0"
+                VerticalAlignment="Center"
+                Background="{DynamicResource TitleBarSecondaryForegroundBrush}"
+                CornerRadius="1.5" />
         </Grid>
-        <StackPanel Margin="16" VerticalAlignment="Bottom"
-                    FocusManager.FocusedElement="{Binding ElementName=newZoneButton}">
+        <StackPanel
+            Margin="16"
+            VerticalAlignment="Bottom"
+            FocusManager.FocusedElement="{Binding ElementName=newZoneButton}">
 
-            <local:ClickAutomationEventButton x:Name="newZoneButton"
-                    HorizontalAlignment="Stretch"
-                    Height="64"
-                    Width="64"
-                    ui:ControlHelper.CornerRadius="64"
-                    Margin="0,8,0,0"
-                    Style="{StaticResource AccentButtonStyle}"
-                    FontFamily="{StaticResource SymbolThemeFontFamily}"
-                    Content="&#xE710;"
-                    FontSize="24"
-                    TabIndex="0"
-                    ToolTip="{x:Static props:Resources.Add_zone}"
-                    DataContext="{Binding Path=Model, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
-                    IsEnabled="{Binding IsZoneAddingAllowed}"
-                    Click="OnAddZone"
-                    OnClickAutomationValue="{x:Static props:Resources.New_zone_added}" />
+            <local:ClickAutomationEventButton
+                x:Name="newZoneButton"
+                Width="64"
+                Height="64"
+                Margin="0,8,0,0"
+                HorizontalAlignment="Stretch"
+                ui:ControlHelper.CornerRadius="64"
+                Click="OnAddZone"
+                Content="&#xE710;"
+                DataContext="{Binding Path=Model, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
+                FontFamily="{StaticResource SymbolThemeFontFamily}"
+                FontSize="24"
+                IsEnabled="{Binding IsZoneAddingAllowed}"
+                OnClickAutomationValue="{x:Static props:Resources.New_zone_added}"
+                Style="{StaticResource AccentButtonStyle}"
+                TabIndex="0"
+                ToolTip="{x:Static props:Resources.Add_zone}" />
 
             <Grid Margin="0,24,0,-4">
                 <Grid.ColumnDefinitions>
@@ -59,17 +65,19 @@
                     <ColumnDefinition Width="8" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <Button Content="{x:Static props:Resources.Cancel}"
-                        Style="{StaticResource DefaultButtonStyle}"
-                        HorizontalAlignment="Stretch"
-                        Grid.Column="2"
-                        TabIndex="2"
-                        Click="OnCancel" />
-                <Button Content="{x:Static props:Resources.Save_Apply}"
-                        Style="{StaticResource AccentButtonStyle}"
-                        TabIndex="1"
-                        HorizontalAlignment="Stretch"
-                        Click="OnSaveApplyTemplate" />
+                <Button
+                    Grid.Column="2"
+                    HorizontalAlignment="Stretch"
+                    Click="OnCancel"
+                    Content="{x:Static props:Resources.Cancel}"
+                    Style="{StaticResource DefaultButtonStyle}"
+                    TabIndex="2" />
+                <Button
+                    HorizontalAlignment="Stretch"
+                    Click="OnSaveApplyTemplate"
+                    Content="{x:Static props:Resources.Save_Apply}"
+                    Style="{StaticResource AccentButtonStyle}"
+                    TabIndex="1" />
             </Grid>
         </StackPanel>
     </Grid>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasZone.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasZone.xaml
index 5fd656f566..ee27a04508 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasZone.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasZone.xaml
@@ -1,40 +1,47 @@
-<UserControl x:Class="FancyZonesEditor.CanvasZone"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:props="clr-namespace:FancyZonesEditor.Properties"
-             xmlns:local="clr-namespace:FancyZonesEditor"
-             mc:Ignorable="d"
-             KeyDown="Border_KeyDown"
-             Background="Transparent"
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="FancyZonesEditor.CanvasZone"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:FancyZonesEditor"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:props="clr-namespace:FancyZonesEditor.Properties"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    Background="Transparent"
+    KeyDown="Border_KeyDown"
+    mc:Ignorable="d">
     <UserControl.Resources>
         <Style x:Key="CanvasZoneThumbStyle" TargetType="{x:Type Thumb}">
-            <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
+            <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Thumb}">
-                        <Border x:Name="ThumbBorder"
-                                Opacity="0"
-                                CornerRadius="0"
-                                BorderBrush="{DynamicResource SystemControlBackgroundAccentBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}">
+                        <Border
+                            x:Name="ThumbBorder"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{DynamicResource SystemControlBackgroundAccentBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="0"
+                            Opacity="0">
                             <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="CommonStates" >
+                                <VisualStateGroup x:Name="CommonStates">
                                     <VisualStateGroup.Transitions>
                                         <VisualTransition GeneratedDuration="0:0:0.15">
                                             <VisualTransition.GeneratedEasingFunction>
-                                                <ExponentialEase EasingMode="EaseInOut"/>
+                                                <ExponentialEase EasingMode="EaseInOut" />
                                             </VisualTransition.GeneratedEasingFunction>
                                         </VisualTransition>
                                     </VisualStateGroup.Transitions>
                                     <VisualState x:Name="Normal" />
                                     <VisualState x:Name="MouseOver">
                                         <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="ThumbBorder" Duration="0:0:0.15" Storyboard.TargetProperty="Opacity" To="1"/>
+                                            <DoubleAnimation
+                                                Storyboard.TargetName="ThumbBorder"
+                                                Storyboard.TargetProperty="Opacity"
+                                                To="1"
+                                                Duration="0:0:0.15" />
                                         </Storyboard>
                                     </VisualState>
                                 </VisualStateGroup>
@@ -45,52 +52,39 @@
             </Setter>
         </Style>
 
-        <Style x:Key="CloseButtonStyle"
-               TargetType="{x:Type Button}">
-            <Setter Property="BorderThickness"
-                    Value="1" />
-            <Setter Property="HorizontalContentAlignment"
-                    Value="Center" />
-            <Setter Property="VerticalContentAlignment"
-                    Value="Center" />
-            <Setter Property="Foreground"
-                    Value="{DynamicResource PrimaryForegroundBrush}" />
-            <Setter Property="Padding"
-                    Value="1" />
+        <Style x:Key="CloseButtonStyle" TargetType="{x:Type Button}">
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Foreground" Value="{DynamicResource PrimaryForegroundBrush}" />
+            <Setter Property="Padding" Value="1" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
-                        <Border x:Name="border"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}"
-                                SnapsToDevicePixels="true">
-                            <ContentPresenter x:Name="contentPresenter"
-                                              Focusable="False"
-                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              Margin="{TemplateBinding Padding}"
-                                              RecognizesAccessKey="True"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        <Border
+                            x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="true">
+                            <ContentPresenter
+                                x:Name="contentPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Focusable="False"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <ControlTemplate.Triggers>
-                            <Trigger Property="IsDefaulted"
-                                     Value="true">
-                                <Setter Property="BorderBrush"
-                                        TargetName="border"
-                                        Value="{DynamicResource SystemControlBackgroundAccentBrush}" />
+                            <Trigger Property="IsDefaulted" Value="true">
+                                <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource SystemControlBackgroundAccentBrush}" />
                             </Trigger>
-                            <Trigger Property="IsMouseOver"
-                                     Value="true">
-                                <Setter Property="Opacity"
-                                        TargetName="contentPresenter"
-                                        Value="0.6" />
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="contentPresenter" Property="Opacity" Value="0.6" />
                             </Trigger>
-                            <Trigger Property="IsPressed"
-                                     Value="true">
-                                <Setter Property="Opacity"
-                                        TargetName="contentPresenter"
-                                        Value="0.4" />
+                            <Trigger Property="IsPressed" Value="true">
+                                <Setter TargetName="contentPresenter" Property="Opacity" Value="0.4" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -99,99 +93,182 @@
         </Style>
     </UserControl.Resources>
 
-    <Border CornerRadius="0"
-            Focusable="True"
-            x:Name="RootBorder"
-            PreviewMouseDown="Border_PreviewMouseDown">
+    <Border
+        x:Name="RootBorder"
+        CornerRadius="0"
+        Focusable="True"
+        PreviewMouseDown="Border_PreviewMouseDown">
         <Border.Style>
             <Style>
-                <Setter Property="Border.Background"
-                        Value="{DynamicResource CanvasZoneBackgroundBrush}" />
-                <Setter Property="Border.BorderBrush"
-                        Value="{DynamicResource CanvasZoneBorderBrush}" />
-                <Setter Property="Border.BorderThickness"
-                        Value="1"/>
+                <Setter Property="Border.Background" Value="{DynamicResource CanvasZoneBackgroundBrush}" />
+                <Setter Property="Border.BorderBrush" Value="{DynamicResource CanvasZoneBorderBrush}" />
+                <Setter Property="Border.BorderThickness" Value="1" />
                 <Style.Triggers>
-                    <Trigger Property="Border.IsKeyboardFocused"
-                             Value="true">
-                        <Setter Property="Border.BorderThickness"
-                                Value="4" />
-                        <Setter Property="Border.BorderBrush"
-                                Value="{DynamicResource SystemControlBackgroundAccentBrush}" />
+                    <Trigger Property="Border.IsKeyboardFocused" Value="true">
+                        <Setter Property="Border.BorderThickness" Value="4" />
+                        <Setter Property="Border.BorderBrush" Value="{DynamicResource SystemControlBackgroundAccentBrush}" />
                     </Trigger>
                 </Style.Triggers>
             </Style>
         </Border.Style>
         <Grid x:Name="Frame">
             <Grid.RowDefinitions>
-                <RowDefinition Height="8"/>
-                <RowDefinition Height="16"/>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="16"/>
-                <RowDefinition Height="8"/>
+                <RowDefinition Height="8" />
+                <RowDefinition Height="16" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="16" />
+                <RowDefinition Height="8" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="8"/>
-                <ColumnDefinition Width="16"/>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="16"/>
-                <ColumnDefinition Width="8"/>
+                <ColumnDefinition Width="8" />
+                <ColumnDefinition Width="16" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="16" />
+                <ColumnDefinition Width="8" />
             </Grid.ColumnDefinitions>
 
-            <DockPanel HorizontalAlignment="Center"
-                       VerticalAlignment="Center"
-                       Grid.Column="2"
-                       Grid.Row="2">
+            <DockPanel
+                Grid.Row="2"
+                Grid.Column="2"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center">
                 <Label
                     Name="LabelID"
-                    DockPanel.Dock="Top"
                     HorizontalContentAlignment="Center"
                     VerticalContentAlignment="Center"
                     Content="ID"
-                    FontWeight="SemiBold"
+                    DockPanel.Dock="Top"
                     FontSize="64"
+                    FontWeight="SemiBold"
                     Foreground="{Binding ElementName=RootBorder, Path=BorderBrush}" />
-                <TextBlock FontSize="16"
-                           Foreground="{Binding ElementName=RootBorder, Path=BorderBrush}"
-                           Opacity="0.6"
-                           DockPanel.Dock="Bottom"
-                           FontWeight="SemiBold"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center">
-                     <Run x:Name="WidthLabel" />
-                     <Run Text="&#xE947;"
-                          FontSize="10"
-                          FontFamily="{StaticResource SymbolThemeFontFamily}" />
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    DockPanel.Dock="Bottom"
+                    FontSize="16"
+                    FontWeight="SemiBold"
+                    Foreground="{Binding ElementName=RootBorder, Path=BorderBrush}"
+                    Opacity="0.6">
+                    <Run x:Name="WidthLabel" />
+                    <Run
+                        FontFamily="{StaticResource SymbolThemeFontFamily}"
+                        FontSize="10"
+                        Text="&#xE947;" />
                     <Run x:Name="HeightLabel" />
                 </TextBlock>
             </DockPanel>
 
-            <Thumb x:Name="Caption" Cursor="SizeAll" Background="Transparent" BorderThickness="3" Padding="4" Grid.Column="0" Grid.ColumnSpan="5" Margin="-1" Grid.Row="0" Grid.RowSpan="5" DragDelta="UniversalDragDelta" DragStarted="Caption_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>
+            <Thumb
+                x:Name="Caption"
+                Grid.Row="0"
+                Grid.RowSpan="5"
+                Grid.Column="0"
+                Grid.ColumnSpan="5"
+                Margin="-1"
+                Padding="4"
+                Background="Transparent"
+                BorderThickness="3"
+                Cursor="SizeAll"
+                DragDelta="UniversalDragDelta"
+                DragStarted="Caption_DragStarted"
+                Style="{DynamicResource CanvasZoneThumbStyle}" />
 
-            <Thumb x:Name="NResize" Cursor="SizeNS" BorderThickness="0,2,0,0" Grid.ColumnSpan="5" DragDelta="UniversalDragDelta" DragStarted="NResize_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>
-            <Thumb x:Name="SResize" Cursor="SizeNS" BorderThickness="0,0,0,2" Grid.Row="4" Grid.ColumnSpan="5" DragDelta="UniversalDragDelta" DragStarted="SResize_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>
-            <Thumb x:Name="WResize" Cursor="SizeWE" BorderThickness="2,0,0,0" Grid.RowSpan="5" DragDelta="UniversalDragDelta" DragStarted="WResize_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>
-            <Thumb x:Name="EResize" Cursor="SizeWE" BorderThickness="0,0,2,0" Grid.Column="4" Grid.RowSpan="5" DragDelta="UniversalDragDelta" DragStarted="EResize_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>
+            <Thumb
+                x:Name="NResize"
+                Grid.ColumnSpan="5"
+                BorderThickness="0,2,0,0"
+                Cursor="SizeNS"
+                DragDelta="UniversalDragDelta"
+                DragStarted="NResize_DragStarted"
+                Style="{DynamicResource CanvasZoneThumbStyle}" />
+            <Thumb
+                x:Name="SResize"
+                Grid.Row="4"
+                Grid.ColumnSpan="5"
+                BorderThickness="0,0,0,2"
+                Cursor="SizeNS"
+                DragDelta="UniversalDragDelta"
+                DragStarted="SResize_DragStarted"
+                Style="{DynamicResource CanvasZoneThumbStyle}" />
+            <Thumb
+                x:Name="WResize"
+                Grid.RowSpan="5"
+                BorderThickness="2,0,0,0"
+                Cursor="SizeWE"
+                DragDelta="UniversalDragDelta"
+                DragStarted="WResize_DragStarted"
+                Style="{DynamicResource CanvasZoneThumbStyle}" />
+            <Thumb
+                x:Name="EResize"
+                Grid.RowSpan="5"
+                Grid.Column="4"
+                BorderThickness="0,0,2,0"
+                Cursor="SizeWE"
+                DragDelta="UniversalDragDelta"
+                DragStarted="EResize_DragStarted"
+                Style="{DynamicResource CanvasZoneThumbStyle}" />
 
-            <Thumb x:Name="NWResize" Cursor="SizeNWSE" BorderThickness="2,2,0,0" Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2" DragDelta="UniversalDragDelta" DragStarted="NWResize_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>
-            <Thumb x:Name="NEResize" Cursor="SizeNESW" BorderThickness="0,2,2,0" Grid.Row="0" Grid.Column="3" Grid.RowSpan="2" Grid.ColumnSpan="2" DragDelta="UniversalDragDelta" DragStarted="NEResize_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>
-            <Thumb x:Name="SWResize" Cursor="SizeNESW" BorderThickness="2,0,0,2" Grid.Row="3" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2" DragDelta="UniversalDragDelta" DragStarted="SWResize_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>
-            <Thumb x:Name="SEResize" Cursor="SizeNWSE" BorderThickness="0,0,2,2" Grid.Row="3" Grid.Column="3" Grid.RowSpan="2" Grid.ColumnSpan="2" DragDelta="UniversalDragDelta" DragStarted="SEResize_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>
+            <Thumb
+                x:Name="NWResize"
+                Grid.Row="0"
+                Grid.RowSpan="2"
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
+                BorderThickness="2,2,0,0"
+                Cursor="SizeNWSE"
+                DragDelta="UniversalDragDelta"
+                DragStarted="NWResize_DragStarted"
+                Style="{DynamicResource CanvasZoneThumbStyle}" />
+            <Thumb
+                x:Name="NEResize"
+                Grid.Row="0"
+                Grid.RowSpan="2"
+                Grid.Column="3"
+                Grid.ColumnSpan="2"
+                BorderThickness="0,2,2,0"
+                Cursor="SizeNESW"
+                DragDelta="UniversalDragDelta"
+                DragStarted="NEResize_DragStarted"
+                Style="{DynamicResource CanvasZoneThumbStyle}" />
+            <Thumb
+                x:Name="SWResize"
+                Grid.Row="3"
+                Grid.RowSpan="2"
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
+                BorderThickness="2,0,0,2"
+                Cursor="SizeNESW"
+                DragDelta="UniversalDragDelta"
+                DragStarted="SWResize_DragStarted"
+                Style="{DynamicResource CanvasZoneThumbStyle}" />
+            <Thumb
+                x:Name="SEResize"
+                Grid.Row="3"
+                Grid.RowSpan="2"
+                Grid.Column="3"
+                Grid.ColumnSpan="2"
+                BorderThickness="0,0,2,2"
+                Cursor="SizeNWSE"
+                DragDelta="UniversalDragDelta"
+                DragStarted="SEResize_DragStarted"
+                Style="{DynamicResource CanvasZoneThumbStyle}" />
 
-            <Button Content="&#xE894;"
-                    BorderThickness="0"
-                    ToolTip="{x:Static props:Resources.Delete_Zone}"
-                    Background="Transparent"
-                    FontSize="16"
-                    Padding="4"
-                    Click="OnClose"
-                    IsTabStop="False"
-                    Focusable="False"
-                    Grid.Row="2"
-                    Grid.Column="2"
-                    FontFamily="{StaticResource SymbolThemeFontFamily}"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Top" Style="{DynamicResource CloseButtonStyle}"/>
+            <Button
+                Grid.Row="2"
+                Grid.Column="2"
+                Padding="4"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                Background="Transparent"
+                BorderThickness="0"
+                Click="OnClose"
+                Content="&#xE894;"
+                Focusable="False"
+                FontFamily="{StaticResource SymbolThemeFontFamily}"
+                FontSize="16"
+                IsTabStop="False"
+                Style="{DynamicResource CloseButtonStyle}"
+                ToolTip="{x:Static props:Resources.Delete_Zone}" />
 
             <Canvas x:Name="Body" />
         </Grid>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/ClickAutomationEventButton.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/ClickAutomationEventButton.xaml
index 70464e1605..b85c7bb347 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/ClickAutomationEventButton.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/ClickAutomationEventButton.xaml
@@ -1,9 +1,10 @@
-<Button x:Class="FancyZonesEditor.ClickAutomationEventButton"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:FancyZonesEditor"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-</Button>
+<Button
+    x:Class="FancyZonesEditor.ClickAutomationEventButton"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:FancyZonesEditor"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d" />
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Controls/CustomSlider.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/Controls/CustomSlider.xaml
index 494b1819ef..d831333023 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Controls/CustomSlider.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Controls/CustomSlider.xaml
@@ -1,5 +1,5 @@
-<Slider x:Class="FancyZonesEditor.Controls.CustomSlider"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:FancyZonesEditor.Controls">
-</Slider>
+<Slider
+    x:Class="FancyZonesEditor.Controls.CustomSlider"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:FancyZonesEditor.Controls" />
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml
index bd8757295b..d992f80602 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml
@@ -13,29 +13,32 @@
         <Grid>
             <Canvas x:Name="Preview" />
             <Canvas x:Name="AdornerLayer" />
-            <Canvas x:Name="MergePanel"
-                    MouseUp="MergePanelMouseUp"
-                    Visibility="Collapsed">
+            <Canvas
+                x:Name="MergePanel"
+                MouseUp="MergePanelMouseUp"
+                Visibility="Collapsed">
                 <Canvas.Effect>
-                    <DropShadowEffect BlurRadius="6" Opacity="0.32"  ShadowDepth="2" />
+                    <DropShadowEffect
+                        BlurRadius="6"
+                        Opacity="0.32"
+                        ShadowDepth="2" />
                 </Canvas.Effect>
-                <StackPanel x:Name="MergeButtons"
-                            Orientation="Horizontal">
-                    <Border CornerRadius="4"
-                            Background="{DynamicResource PrimaryBackgroundBrush}">
-                        
-                        <Button Width="134"
-                                Height="36"
-                                Margin="0"
-                                Style="{StaticResource DefaultButtonStyle}"
-                                Click="MergeClick">
+                <StackPanel x:Name="MergeButtons" Orientation="Horizontal">
+                    <Border Background="{DynamicResource PrimaryBackgroundBrush}" CornerRadius="4">
+
+                        <Button
+                            Width="134"
+                            Height="36"
+                            Margin="0"
+                            Click="MergeClick"
+                            Style="{StaticResource DefaultButtonStyle}">
                             <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="&#xE746;"
-                                           FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                           Foreground="{DynamicResource PrimaryForegroundBrush}"
-                                           Margin="0,3,8,0" />
-                                <TextBlock Text="{x:Static props:Resources.Merge_zones}"
-                                           Foreground="{DynamicResource PrimaryForegroundBrush}"/>
+                                <TextBlock
+                                    Margin="0,3,8,0"
+                                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                    Foreground="{DynamicResource PrimaryForegroundBrush}"
+                                    Text="&#xE746;" />
+                                <TextBlock Foreground="{DynamicResource PrimaryForegroundBrush}" Text="{x:Static props:Resources.Merge_zones}" />
                             </StackPanel>
                         </Button>
                     </Border>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml
index 0213518bc0..63e440cc19 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml
@@ -1,86 +1,81 @@
-<local:EditorWindow x:Class="FancyZonesEditor.GridEditorWindow"
-                    AutomationProperties.Name="{x:Static props:Resources.Grid_Layout_Editor}"
-                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:local="clr-namespace:FancyZonesEditor"
-                    xmlns:props="clr-namespace:FancyZonesEditor.Properties"
-                    mc:Ignorable="d"
-                    Title=""
-                    MinWidth="360"
-                    BorderThickness="0"
-                    xmlns:ui="http://schemas.modernwpf.com/2019"
-                    ui:WindowHelper.UseModernWindowStyle="True"
-                    ui:TitleBar.IsIconVisible="False"
-                    SizeToContent="WidthAndHeight"
-                    Background="{DynamicResource PrimaryBackgroundBrush}"
-                    ResizeMode="NoResize"
-                    WindowStartupLocation="CenterOwner"
-                    ContentRendered="EditorWindow_ContentRendered"
-                    Closed="OnClosed">
+<local:EditorWindow
+    x:Class="FancyZonesEditor.GridEditorWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:FancyZonesEditor"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:props="clr-namespace:FancyZonesEditor.Properties"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
+    Title=""
+    MinWidth="360"
+    ui:TitleBar.IsIconVisible="False"
+    ui:WindowHelper.UseModernWindowStyle="True"
+    AutomationProperties.Name="{x:Static props:Resources.Grid_Layout_Editor}"
+    Background="{DynamicResource PrimaryBackgroundBrush}"
+    BorderThickness="0"
+    Closed="OnClosed"
+    ContentRendered="EditorWindow_ContentRendered"
+    ResizeMode="NoResize"
+    SizeToContent="WidthAndHeight"
+    WindowStartupLocation="CenterOwner"
+    mc:Ignorable="d">
     <Grid>
         <Grid
             Height="36"
-            Background="{DynamicResource SecondaryBackgroundBrush}"
             Margin="0,-36,0,0"
+            HorizontalAlignment="Stretch"
             VerticalAlignment="Top"
-            HorizontalAlignment="Stretch">
+            Background="{DynamicResource SecondaryBackgroundBrush}">
 
             <Border
-                Background="{DynamicResource TitleBarSecondaryForegroundBrush}"
                 Width="30"
                 Height="3"
-                CornerRadius="1.5"
+                Margin="0,4,0,0"
                 VerticalAlignment="Center"
-                Margin="0,4,0,0" />
+                Background="{DynamicResource TitleBarSecondaryForegroundBrush}"
+                CornerRadius="1.5" />
         </Grid>
         <StackPanel Margin="16">
             <StackPanel Margin="0,8,0,0">
-                <TextBlock
-                    Focusable="True"
-                    TextWrapping="Wrap">
-                    <Run 
-                        FontWeight="Bold" 
-                        Text="{x:Static props:Resources.SplitterName}" />
+                <TextBlock Focusable="True" TextWrapping="Wrap">
+                    <Run FontWeight="Bold" Text="{x:Static props:Resources.SplitterName}" />
                     <Run Text="{x:Static props:Resources.SplitterDescription}" />
                 </TextBlock>
-                <TextBlock 
+                <TextBlock
                     Margin="0,8,0,0"
                     Focusable="True"
                     TextWrapping="Wrap">
-                    <Run 
-                        FontWeight="Bold" 
-                        Text="{x:Static props:Resources.MergeName}" />
+                    <Run FontWeight="Bold" Text="{x:Static props:Resources.MergeName}" />
                     <Run Text="{x:Static props:Resources.MergeDescription}" />
                 </TextBlock>
-                <TextBlock 
+                <TextBlock
                     Margin="0,8,0,0"
                     Focusable="True"
                     TextWrapping="Wrap">
-                    <Run 
-                        FontWeight="Bold" 
-                        Text="{x:Static props:Resources.KeyboardControlsName}" />
+                    <Run FontWeight="Bold" Text="{x:Static props:Resources.KeyboardControlsName}" />
                     <Run Text="{x:Static props:Resources.KeyboardControlsDescription}" />
                 </TextBlock>
             </StackPanel>
             <Grid Margin="0,24,0,-36">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="8"/>
-                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="8" />
+                    <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <Button Content="{x:Static props:Resources.Cancel}"
-                    Style="{StaticResource DefaultButtonStyle}"
-                    HorizontalAlignment="Stretch"
-                    TabIndex="1"
+                <Button
                     Grid.Column="2"
-                    Click="OnCancel" />
-                <Button Content="{x:Static props:Resources.Save_Apply}"
-                    Style="{StaticResource AccentButtonStyle}"
-                    TabIndex="0"
                     HorizontalAlignment="Stretch"
-                    Click="OnSaveApplyTemplate" />
+                    Click="OnCancel"
+                    Content="{x:Static props:Resources.Cancel}"
+                    Style="{StaticResource DefaultButtonStyle}"
+                    TabIndex="1" />
+                <Button
+                    HorizontalAlignment="Stretch"
+                    Click="OnSaveApplyTemplate"
+                    Content="{x:Static props:Resources.Save_Apply}"
+                    Style="{StaticResource AccentButtonStyle}"
+                    TabIndex="0" />
             </Grid>
         </StackPanel>
     </Grid>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridResizer.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/GridResizer.xaml
index 0ed5f1673d..4238ed7e36 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridResizer.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridResizer.xaml
@@ -1,46 +1,49 @@
-<Thumb x:Class="FancyZonesEditor.GridResizer"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:FancyZonesEditor"
-             xmlns:props="clr-namespace:FancyZonesEditor.Properties"
-             mc:Ignorable="d" 
-             Focusable="True"
-             AutomationProperties.Name="{x:Static props:Resources.Resizer_Thumb_Announce}"
-             d:DesignHeight="300" d:DesignWidth="300">
+<Thumb
+    x:Class="FancyZonesEditor.GridResizer"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:FancyZonesEditor"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:props="clr-namespace:FancyZonesEditor.Properties"
+    d:DesignHeight="300"
+    d:DesignWidth="300"
+    AutomationProperties.Name="{x:Static props:Resources.Resizer_Thumb_Announce}"
+    Focusable="True"
+    mc:Ignorable="d">
     <Thumb.Template>
         <ControlTemplate>
-            <Border x:Name="Body"
-                    Height="48"
-                    Width="48"
-                    CornerRadius="48"
-                    Background="{DynamicResource SystemControlBackgroundAccentBrush}">
+            <Border
+                x:Name="Body"
+                Width="48"
+                Height="48"
+                Background="{DynamicResource SystemControlBackgroundAccentBrush}"
+                CornerRadius="48">
                 <Border.Effect>
-                    <DropShadowEffect BlurRadius="6"
-                                      Opacity="0.24"
-                                      ShadowDepth="1" />
+                    <DropShadowEffect
+                        BlurRadius="6"
+                        Opacity="0.24"
+                        ShadowDepth="1" />
                 </Border.Effect>
                 <Grid>
-                    <Rectangle Height="20"
-                               Width="2"
-                               Fill="White"
-                               Margin="5,0,0,0" />
-                    <Rectangle Height="20"
-                               Width="2"
-                               Fill="White"
-                               Margin="-5,0,0,0" />
+                    <Rectangle
+                        Width="2"
+                        Height="20"
+                        Margin="5,0,0,0"
+                        Fill="White" />
+                    <Rectangle
+                        Width="2"
+                        Height="20"
+                        Margin="-5,0,0,0"
+                        Fill="White" />
                 </Grid>
             </Border>
             <ControlTemplate.Triggers>
                 <Trigger Property="IsMouseOver" Value="true">
-                    <Setter Property="Background"
-                            TargetName="Body"
-                            Value="{DynamicResource SystemAccentColorLight1Brush}"/>
+                    <Setter TargetName="Body" Property="Background" Value="{DynamicResource SystemAccentColorLight1Brush}" />
                 </Trigger>
                 <Trigger Property="IsKeyboardFocused" Value="True">
-                    <Setter Property="Background" TargetName="Body"
-                            Value="{DynamicResource SystemAccentColorLight3Brush}" />
+                    <Setter TargetName="Body" Property="Background" Value="{DynamicResource SystemAccentColorLight3Brush}" />
                 </Trigger>
             </ControlTemplate.Triggers>
         </ControlTemplate>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml
index 67f10659a8..bdfb5d0808 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml
@@ -4,39 +4,39 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:FancyZonesEditor"
-    xmlns:props="clr-namespace:FancyZonesEditor.Properties"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:props="clr-namespace:FancyZonesEditor.Properties"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     d:DesignHeight="450"
     d:DesignWidth="800"
+    ui:ControlHelper.CornerRadius="4"
     Background="{DynamicResource GridZoneBackgroundBrush}"
     BorderBrush="{DynamicResource SystemControlBackgroundAccentBrush}"
     BorderThickness="1"
-    Opacity="1"
     Focusable="True"
-    IsTabStop="True"    
-    ui:ControlHelper.CornerRadius="4"
+    IsTabStop="True"
+    Opacity="1"
     mc:Ignorable="d">
-    
+
     <Grid x:Name="Frame">
         <Canvas x:Name="Body" />
-        <DockPanel HorizontalAlignment="Center"
-                   VerticalAlignment="Center">
+        <DockPanel HorizontalAlignment="Center" VerticalAlignment="Center">
             <Label
                 Name="LabelID"
-                DockPanel.Dock="Top"
                 HorizontalContentAlignment="Center"
                 VerticalContentAlignment="Center"
                 Content="ID"
+                DockPanel.Dock="Top"
                 FontSize="68"
                 FontWeight="SemiBold"
                 Foreground="{DynamicResource PrimaryForegroundBrush}" />
-            <TextBlock FontSize="16"
-                       Foreground="{DynamicResource SecondaryForegroundBrush}"
-                       FontWeight="SemiBold"
-                       DockPanel.Dock="Bottom"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center">
+            <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                DockPanel.Dock="Bottom"
+                FontSize="16"
+                FontWeight="SemiBold"
+                Foreground="{DynamicResource SecondaryForegroundBrush}">
                 <Run x:Name="WidthLabel" />
                 <Run Text="×" />
                 <Run x:Name="HeightLabel" />
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/LayoutOverlayWindow.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/LayoutOverlayWindow.xaml
index 01b276518c..884455212b 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/LayoutOverlayWindow.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/LayoutOverlayWindow.xaml
@@ -1,16 +1,17 @@
-<Window x:Class="FancyZonesEditor.LayoutOverlayWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:FancyZonesEditor"
-        mc:Ignorable="d"
-        Title="FancyZones Layout"
-        Height="450"
-        Width="800"
-        ShowInTaskbar="False"
-        ResizeMode="NoResize"
-        WindowStyle="None"
-        AllowsTransparency="True"
-        Loaded="Window_Loaded"
-        Background="{DynamicResource BackdropBrush}"/>
\ No newline at end of file
+<Window
+    x:Class="FancyZonesEditor.LayoutOverlayWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:FancyZonesEditor"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="FancyZones Layout"
+    Width="800"
+    Height="450"
+    AllowsTransparency="True"
+    Background="{DynamicResource BackdropBrush}"
+    Loaded="Window_Loaded"
+    ResizeMode="NoResize"
+    ShowInTaskbar="False"
+    WindowStyle="None"
+    mc:Ignorable="d" />
\ No newline at end of file
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/LayoutPreview.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/LayoutPreview.xaml
index 601d084507..0c2ed45e49 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/LayoutPreview.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/LayoutPreview.xaml
@@ -1,17 +1,16 @@
-<UserControl x:Class="FancyZonesEditor.LayoutPreview"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:FancyZonesEditor"
-             mc:Ignorable="d" 
-             Loaded="OnLoaded"
-             d:DesignHeight="450"
-             d:DesignWidth="800">
+<UserControl
+    x:Class="FancyZonesEditor.LayoutPreview"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:FancyZonesEditor"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    Loaded="OnLoaded"
+    mc:Ignorable="d">
     <Grid>
-        <Border CornerRadius="4"
-                Background="{DynamicResource LayoutPreviewBackgroundBrush}" />
-        <Grid x:Name="Body"
-              Background="Transparent" />
+        <Border Background="{DynamicResource LayoutPreviewBackgroundBrush}" CornerRadius="4" />
+        <Grid x:Name="Body" Background="Transparent" />
     </Grid>
 </UserControl>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
index 5fef7a0cc0..86b65e9ed2 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
@@ -1,30 +1,31 @@
-<Window x:Class="FancyZonesEditor.MainWindow"
-        x:Name="MainWindow1"
-        AutomationProperties.Name="{x:Static props:Resources.Fancy_Zones_Main_Editor}"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:ui="http://schemas.modernwpf.com/2019"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:FancyZonesEditor"
-        xmlns:Converters="clr-namespace:FancyZonesEditor.Converters"
-        xmlns:props="clr-namespace:FancyZonesEditor.Properties"
-        xmlns:local1="clr-namespace:FancyZonesEditor.ViewModels"
-        xmlns:controls="clr-namespace:ModernWpf.Controls;assembly=ModernWpf"
-        xmlns:sys="clr-namespace:System;assembly=mscorlib" 
-        xmlns:fancyZonesControls="clr-namespace:FancyZonesEditor.Controls"
-        mc:Ignorable="d"
-        Title="{x:Static props:Resources.Fancy_Zones_Editor_App_Title}"
-        ui:WindowHelper.UseModernWindowStyle="True"
-        ui:TitleBar.IsIconVisible="True"
-        ui:TitleBar.Background="{DynamicResource TertiaryBackgroundBrush}"
-        ui:TitleBar.InactiveBackground="{DynamicResource TertiaryBackgroundBrush}"
-        MinWidth="360"
-        WindowStartupLocation="CenterOwner"
-        ContentRendered="OnContentRendered"
-        Background="{DynamicResource PrimaryBackgroundBrush}"
-        Closing="OnClosing"
-        ResizeMode="CanResize">
+<Window
+    x:Class="FancyZonesEditor.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Converters="clr-namespace:FancyZonesEditor.Converters"
+    xmlns:controls="clr-namespace:ModernWpf.Controls;assembly=ModernWpf"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:fancyZonesControls="clr-namespace:FancyZonesEditor.Controls"
+    xmlns:local="clr-namespace:FancyZonesEditor"
+    xmlns:local1="clr-namespace:FancyZonesEditor.ViewModels"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:props="clr-namespace:FancyZonesEditor.Properties"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
+    x:Name="MainWindow1"
+    Title="{x:Static props:Resources.Fancy_Zones_Editor_App_Title}"
+    MinWidth="360"
+    ui:TitleBar.Background="{DynamicResource TertiaryBackgroundBrush}"
+    ui:TitleBar.InactiveBackground="{DynamicResource TertiaryBackgroundBrush}"
+    ui:TitleBar.IsIconVisible="True"
+    ui:WindowHelper.UseModernWindowStyle="True"
+    AutomationProperties.Name="{x:Static props:Resources.Fancy_Zones_Main_Editor}"
+    Background="{DynamicResource PrimaryBackgroundBrush}"
+    Closing="OnClosing"
+    ContentRendered="OnContentRendered"
+    ResizeMode="CanResize"
+    WindowStartupLocation="CenterOwner"
+    mc:Ignorable="d">
     <Window.Resources>
         <Thickness x:Key="ContentDialogPadding">24,16,0,24</Thickness>
         <Thickness x:Key="ContentDialogCommandSpaceMargin">0,24,24,0</Thickness>
@@ -35,40 +36,43 @@
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
         <ContextMenu x:Key="LayoutContextMenu" Visibility="{Binding Path=Type, Converter={StaticResource LayoutModelTypeBlankToVisibilityConverter}}">
-            <MenuItem Header="{x:Static props:Resources.Edit}"
-                      Click="EditLayout_Click">
+            <MenuItem Click="EditLayout_Click" Header="{x:Static props:Resources.Edit}">
                 <MenuItem.Icon>
                     <ui:FontIcon Glyph="&#xE70F;" />
                 </MenuItem.Icon>
             </MenuItem>
-            <MenuItem Header="{x:Static props:Resources.Edit_zones}"
-                      Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}"
-                      Click="EditZones_Click">
+            <MenuItem
+                Click="EditZones_Click"
+                Header="{x:Static props:Resources.Edit_zones}"
+                Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
                 <MenuItem.Icon>
                     <ui:FontIcon Glyph="&#xED35;" />
                 </MenuItem.Icon>
             </MenuItem>
 
 
-            <MenuItem Header="{x:Static props:Resources.Duplicate}"
-                      Click="DuplicateLayout_Click"
-                      Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
+            <MenuItem
+                Click="DuplicateLayout_Click"
+                Header="{x:Static props:Resources.Duplicate}"
+                Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
                 <MenuItem.Icon>
                     <ui:FontIcon Glyph="&#xE8C8;" />
                 </MenuItem.Icon>
             </MenuItem>
 
-            <MenuItem Header="{x:Static props:Resources.Create_Custom_From_Template}"
-                      Click="DuplicateLayout_Click"
-                      Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeTemplateToVisibilityConverter}}">
+            <MenuItem
+                Click="DuplicateLayout_Click"
+                Header="{x:Static props:Resources.Create_Custom_From_Template}"
+                Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeTemplateToVisibilityConverter}}">
                 <MenuItem.Icon>
                     <ui:FontIcon Glyph="&#xE8C8;" />
                 </MenuItem.Icon>
             </MenuItem>
             <Separator Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}" />
-            <MenuItem Header="{x:Static props:Resources.Delete}"
-                      Click="DeleteLayout_Click"
-                      Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
+            <MenuItem
+                Click="DeleteLayout_Click"
+                Header="{x:Static props:Resources.Delete}"
+                Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
                 <MenuItem.Icon>
                     <ui:FontIcon Glyph="&#xE74D;" />
                 </MenuItem.Icon>
@@ -76,11 +80,12 @@
         </ContextMenu>
 
         <DataTemplate x:Key="MonitorItemTemplate">
-            <Border x:Name="MonitorItem"
-                    Width="{Binding DisplayWidth}"
-                    Height="{Binding DisplayHeight}"
-                    AutomationProperties.Name="{x:Static props:Resources.Monitor}"
-                    AutomationProperties.HelpText="{Binding Index}">
+            <Border
+                x:Name="MonitorItem"
+                Width="{Binding DisplayWidth}"
+                Height="{Binding DisplayHeight}"
+                AutomationProperties.HelpText="{Binding Index}"
+                AutomationProperties.Name="{x:Static props:Resources.Monitor}">
                 <Border.ToolTip>
                     <ToolTip>
                         <StackPanel>
@@ -92,83 +97,90 @@
                         </StackPanel>
                     </ToolTip>
                 </Border.ToolTip>
-                <StackPanel Orientation="Vertical"
-                            VerticalAlignment="Center">
-                    <TextBlock Name="IndexText"
-                               Text="{Binding Index}"
-                               FontSize="28"
-                               FontWeight="SemiBold"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}" />
-                    <TextBlock Name="ResolutionText"
-                               TextTrimming="CharacterEllipsis"
-                               Text="{Binding Dimensions}"
-                               FontSize="12"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}" />
-                    <TextBlock Name="ScalingText"
-                               TextTrimming="CharacterEllipsis"
-                               Text="{Binding Scaling}"
-                               FontSize="12"
-                               HorizontalAlignment="Center"
-                               Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}" />
+                <StackPanel VerticalAlignment="Center" Orientation="Vertical">
+                    <TextBlock
+                        Name="IndexText"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="28"
+                        FontWeight="SemiBold"
+                        Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}"
+                        Text="{Binding Index}" />
+                    <TextBlock
+                        Name="ResolutionText"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="12"
+                        Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}"
+                        Text="{Binding Dimensions}"
+                        TextTrimming="CharacterEllipsis" />
+                    <TextBlock
+                        Name="ScalingText"
+                        HorizontalAlignment="Center"
+                        FontSize="12"
+                        Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}"
+                        Text="{Binding Scaling}"
+                        TextTrimming="CharacterEllipsis" />
                 </StackPanel>
             </Border>
         </DataTemplate>
         <DataTemplate x:Key="LayoutItemTemplate">
             <Grid Background="Transparent">
-                <Grid Width="180"
-                      Height="140"
-                      Margin="16,12,16,16">
+                <Grid
+                    Width="180"
+                    Height="140"
+                    Margin="16,12,16,16">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="24" />
                         <RowDefinition Height="124" />
                         <RowDefinition Height="0" />
                     </Grid.RowDefinitions>
-                    <TextBlock Name="layoutName"
-                               TextTrimming="CharacterEllipsis"
-                               Text="{Binding Name}"
-                               FontSize="16"
-                               FontWeight="SemiBold"
-                               Margin="0,0,24,0"
-                               ToolTip="{Binding Name}"
-                               Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}" />
-                    <local:LayoutPreview Grid.Row="1"
-                                         Margin="0,8,0,8"
-                                         VerticalAlignment="Stretch"
-                                         HorizontalAlignment="Stretch" />
-                </Grid>
-                <Button x:Name="EditLayoutButton"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        Margin="4"
-                        Height="36"
-                        Width="36"
-                        Padding="0"
-                        Grid.RowSpan="4"
-                        BorderBrush="Transparent"
-                        Click="EditLayout_Click"
-                        Background="Transparent"
-                        Visibility="{Binding Path=Type, Converter={StaticResource LayoutModelTypeBlankToVisibilityConverter}}"
+                    <TextBlock
+                        Name="layoutName"
+                        Margin="0,0,24,0"
+                        FontSize="16"
+                        FontWeight="SemiBold"
                         Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}"
-                        ToolTip="{x:Static props:Resources.Edit}"
-                        AutomationProperties.HelpText="{x:Static props:Resources.Edit}"
-                        AutomationProperties.Name="{Binding Name}"
-                        Style="{StaticResource AccentButtonStyle}"
-                        ui:ControlHelper.CornerRadius="36">
+                        Text="{Binding Name}"
+                        TextTrimming="CharacterEllipsis"
+                        ToolTip="{Binding Name}" />
+                    <local:LayoutPreview
+                        Grid.Row="1"
+                        Margin="0,8,0,8"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch" />
+                </Grid>
+                <Button
+                    x:Name="EditLayoutButton"
+                    Grid.RowSpan="4"
+                    Width="36"
+                    Height="36"
+                    Margin="4"
+                    Padding="0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    ui:ControlHelper.CornerRadius="36"
+                    AutomationProperties.HelpText="{x:Static props:Resources.Edit}"
+                    AutomationProperties.Name="{Binding Name}"
+                    Background="Transparent"
+                    BorderBrush="Transparent"
+                    Click="EditLayout_Click"
+                    Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}"
+                    Style="{StaticResource AccentButtonStyle}"
+                    ToolTip="{x:Static props:Resources.Edit}"
+                    Visibility="{Binding Path=Type, Converter={StaticResource LayoutModelTypeBlankToVisibilityConverter}}">
                     <Button.Content>
-                        <TextBlock Text="&#xE70F;" 
-                                       FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                       FontSize="16"
-                                       AutomationProperties.Name="{x:Static props:Resources.Edit}" />
+                        <TextBlock
+                            AutomationProperties.Name="{x:Static props:Resources.Edit}"
+                            FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                            FontSize="16"
+                            Text="&#xE70F;" />
                     </Button.Content>
                 </Button>
             </Grid>
         </DataTemplate>
 
-        <Style TargetType="{x:Type fancyZonesControls:CustomSlider}" BasedOn="{StaticResource {x:Type Slider}}"></Style>
+        <Style BasedOn="{StaticResource {x:Type Slider}}" TargetType="{x:Type fancyZonesControls:CustomSlider}" />
     </Window.Resources>
 
     <Grid>
@@ -177,8 +189,7 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <Grid Grid.Row="1"
-              Background="{DynamicResource PrimaryBackgroundBrush}">
+        <Grid Grid.Row="1" Background="{DynamicResource PrimaryBackgroundBrush}">
             <ScrollViewer>
                 <Grid Margin="16,16,16,32">
                     <Grid.RowDefinitions>
@@ -189,49 +200,50 @@
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
 
-                    <local:HeadingTextBlock Text="{x:Static props:Resources.Templates}"
-                        AutomationProperties.HeadingLevel="Level1"
+                    <local:HeadingTextBlock
                         x:Name="TemplatesHeaderBlock"
+                        AutomationProperties.HeadingLevel="Level1"
+                        FontSize="24"
                         FontWeight="SemiBold"
-                        FontSize="24" />
+                        Text="{x:Static props:Resources.Templates}" />
 
-                    <ui:GridView ItemsSource="{Binding TemplateModels}"
-                                 Grid.Row="1"
-                                 ItemTemplate="{StaticResource LayoutItemTemplate}"
-                                 AutomationProperties.LabeledBy="{Binding ElementName=TemplatesHeaderBlock}"
-                                 TabIndex="1"
-                                 IsItemClickEnabled="True"
-                                 SelectionMode="Single"
-                                 IsSelectionEnabled="True"
-                                 ItemClick="Layout_ItemClick"
-                                 MouseDoubleClick="LayoutItem_MouseDoubleClick"
-                                 Margin="-8,8,-8,0">
+                    <ui:GridView
+                        Grid.Row="1"
+                        Margin="-8,8,-8,0"
+                        AutomationProperties.LabeledBy="{Binding ElementName=TemplatesHeaderBlock}"
+                        IsItemClickEnabled="True"
+                        IsSelectionEnabled="True"
+                        ItemClick="Layout_ItemClick"
+                        ItemTemplate="{StaticResource LayoutItemTemplate}"
+                        ItemsSource="{Binding TemplateModels}"
+                        MouseDoubleClick="LayoutItem_MouseDoubleClick"
+                        SelectionMode="Single"
+                        TabIndex="1">
                         <ui:GridView.ItemContainerStyle>
-                            <Style BasedOn="{StaticResource LayoutItemContainerStyle}"
-                                   TargetType="ui:GridViewItem">
-                                <Setter Property="ContextMenu"
-                                        Value="{StaticResource LayoutContextMenu}">
-                                </Setter>
+                            <Style BasedOn="{StaticResource LayoutItemContainerStyle}" TargetType="ui:GridViewItem">
+                                <Setter Property="ContextMenu" Value="{StaticResource LayoutContextMenu}" />
                             </Style>
                         </ui:GridView.ItemContainerStyle>
                     </ui:GridView>
 
-                    <local:HeadingTextBlock Text="{x:Static props:Resources.Custom}"
-                               AutomationProperties.HeadingLevel="Level1"
-                               x:Name="CustomHeaderBlock"
-                               FontWeight="SemiBold"
-                               Grid.Row="2"
-                               Margin="0,16,0,0"
-                               FontSize="24" />
+                    <local:HeadingTextBlock
+                        x:Name="CustomHeaderBlock"
+                        Grid.Row="2"
+                        Margin="0,16,0,0"
+                        AutomationProperties.HeadingLevel="Level1"
+                        FontSize="24"
+                        FontWeight="SemiBold"
+                        Text="{x:Static props:Resources.Custom}" />
 
-                   
-                    <StackPanel Height="240"
-                                Grid.Row="4"
-                                Orientation="Vertical"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Opacity="0.6"
-                                Margin="16,48,16,16">
+
+                    <StackPanel
+                        Grid.Row="4"
+                        Height="240"
+                        Margin="16,48,16,16"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Opacity="0.6"
+                        Orientation="Vertical">
                         <StackPanel.Style>
                             <Style TargetType="StackPanel">
                                 <Setter Property="Visibility" Value="Collapsed" />
@@ -243,28 +255,29 @@
                             </Style>
                         </StackPanel.Style>
                         <controls:PathIcon
-                            Foreground="{DynamicResource SecondaryForegroundBrush}"
                             Height="38"
-                            Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z" />
-                        <TextBlock Text="{x:Static props:Resources.No_Custom_Layouts_Message}" Margin="0,16,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}" />
+                            Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"
+                            Foreground="{DynamicResource SecondaryForegroundBrush}" />
+                        <TextBlock
+                            Margin="0,16,0,0"
+                            Foreground="{DynamicResource SecondaryForegroundBrush}"
+                            Text="{x:Static props:Resources.No_Custom_Layouts_Message}" />
                     </StackPanel>
-                    <ui:GridView ItemsSource="{Binding CustomModels}"
-                                 TabIndex="2"
-                                 ItemTemplate="{StaticResource LayoutItemTemplate}"
-                                 IsSelectionEnabled="True"
-                                 SelectionMode="Single"
-                                 IsItemClickEnabled="True"
-                                 ItemClick="Layout_ItemClick"
-                                 MouseDoubleClick="LayoutItem_MouseDoubleClick"
-                                 AutomationProperties.LabeledBy="{Binding ElementName=CustomHeaderBlock}"
-                                 Margin="-8,8,-8,0"
-                                 Grid.Row="4">
+                    <ui:GridView
+                        Grid.Row="4"
+                        Margin="-8,8,-8,0"
+                        AutomationProperties.LabeledBy="{Binding ElementName=CustomHeaderBlock}"
+                        IsItemClickEnabled="True"
+                        IsSelectionEnabled="True"
+                        ItemClick="Layout_ItemClick"
+                        ItemTemplate="{StaticResource LayoutItemTemplate}"
+                        ItemsSource="{Binding CustomModels}"
+                        MouseDoubleClick="LayoutItem_MouseDoubleClick"
+                        SelectionMode="Single"
+                        TabIndex="2">
                         <ui:GridView.ItemContainerStyle>
-                            <Style BasedOn="{StaticResource LayoutItemContainerStyle}"
-                                   TargetType="ui:GridViewItem">
-                                <Setter Property="ContextMenu"
-                                        Value="{StaticResource LayoutContextMenu}">
-                                </Setter>
+                            <Style BasedOn="{StaticResource LayoutItemContainerStyle}" TargetType="ui:GridViewItem">
+                                <Setter Property="ContextMenu" Value="{StaticResource LayoutContextMenu}" />
                             </Style>
                         </ui:GridView.ItemContainerStyle>
                     </ui:GridView>
@@ -273,64 +286,70 @@
                 </Grid>
             </ScrollViewer>
 
-            <Button x:Name="NewLayoutButton"
-                    Click="NewLayoutButton_Click"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Bottom"
-                    AutomationProperties.Name="{x:Static props:Resources.Create_new_layout}"
-                    TabIndex="3"
-                    Padding="0"
-                    Height="36"
-                    Margin="16"
-                    Style="{StaticResource AccentButtonStyle}"
-                    Grid.Row="3">
-                <StackPanel Orientation="Horizontal"
-                            Margin="8">
-                    <TextBlock Text="&#xE710;"
-                               AutomationProperties.Name="{x:Static props:Resources.Create_new_layout}"
-                               FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                               Foreground="{DynamicResource AccentButtonForeground}" />
-                    <TextBlock Text="{x:Static props:Resources.Create_new_layout}"
-                               Margin="12,-3,0,0"
-                               Foreground="{DynamicResource AccentButtonForeground}" />
+            <Button
+                x:Name="NewLayoutButton"
+                Grid.Row="3"
+                Height="36"
+                Margin="16"
+                Padding="0"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Bottom"
+                AutomationProperties.Name="{x:Static props:Resources.Create_new_layout}"
+                Click="NewLayoutButton_Click"
+                Style="{StaticResource AccentButtonStyle}"
+                TabIndex="3">
+                <StackPanel Margin="8" Orientation="Horizontal">
+                    <TextBlock
+                        AutomationProperties.Name="{x:Static props:Resources.Create_new_layout}"
+                        FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                        Foreground="{DynamicResource AccentButtonForeground}"
+                        Text="&#xE710;" />
+                    <TextBlock
+                        Margin="12,-3,0,0"
+                        Foreground="{DynamicResource AccentButtonForeground}"
+                        Text="{x:Static props:Resources.Create_new_layout}" />
                 </StackPanel>
                 <Button.Effect>
-                    <DropShadowEffect BlurRadius="6"
-                                      Opacity="0.32"
-                                      ShadowDepth="1" />
+                    <DropShadowEffect
+                        BlurRadius="6"
+                        Opacity="0.32"
+                        ShadowDepth="1" />
                 </Button.Effect>
             </Button>
         </Grid>
 
         <Grid Background="{DynamicResource TertiaryBackgroundBrush}">
             <Grid.Effect>
-                <DropShadowEffect BlurRadius="6"
-                                  Opacity="0.32"
-                                  ShadowDepth="1" />
+                <DropShadowEffect
+                    BlurRadius="6"
+                    Opacity="0.32"
+                    ShadowDepth="1" />
             </Grid.Effect>
-            <ScrollViewer ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                          ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                          ScrollViewer.CanContentScroll="True"
-                          ScrollViewer.PanningMode="HorizontalOnly"
-                          Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UIElement}}"
-                          PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
+            <ScrollViewer
+                Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UIElement}}"
+                PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"
+                ScrollViewer.CanContentScroll="True"
+                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                ScrollViewer.PanningMode="HorizontalOnly"
+                ScrollViewer.VerticalScrollBarVisibility="Disabled">
                 <ScrollViewer.DataContext>
                     <local1:MonitorViewModel x:Name="monitorViewModel" />
                 </ScrollViewer.DataContext>
                 <Grid>
-                    <ui:GridView TabIndex="0"
-                                 HorizontalAlignment="Center"
-                                 IsSelectionEnabled="True"
-                                 SelectionMode="Single"
-                                 IsItemClickEnabled="True"
-                                 ItemClick="Monitor_ItemClick"
-                                 ItemContainerStyle="{StaticResource MonitorItemContainerStyle}"
-                                 ItemTemplate="{StaticResource MonitorItemTemplate}"
-                                 ItemsSource="{Binding MonitorInfoForViewModel}" />
+                    <ui:GridView
+                        HorizontalAlignment="Center"
+                        IsItemClickEnabled="True"
+                        IsSelectionEnabled="True"
+                        ItemClick="Monitor_ItemClick"
+                        ItemContainerStyle="{StaticResource MonitorItemContainerStyle}"
+                        ItemTemplate="{StaticResource MonitorItemTemplate}"
+                        ItemsSource="{Binding MonitorInfoForViewModel}"
+                        SelectionMode="Single"
+                        TabIndex="0" />
                 </Grid>
             </ScrollViewer>
             <!--
-                // Commented because of issue https://github.com/microsoft/PowerToys/issues/19828 
+                // Commented because of issue https://github.com/microsoft/PowerToys/issues/19828
                 // Settings would launch under the overlay for FZ Editor
                 //Lots of permutations to validate, Win10/11. Settings not launched, already launched, ...
 
@@ -352,275 +371,300 @@
             -->
         </Grid>
 
-        <ui:ContentDialog x:Name="EditLayoutDialog"
-                          Background="{DynamicResource PrimaryBackgroundBrush}"
-                          PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
-                          SecondaryButtonText="{x:Static props:Resources.Cancel}"
-                          PrimaryButtonText="{x:Static props:Resources.Save}"
-                          PrimaryButtonClick="EditLayoutDialog_PrimaryButtonClick"
-                          SecondaryButtonClick="EditLayoutDialog_SecondaryButtonClick"
-                          ScrollViewer.VerticalScrollBarVisibility="Auto"
-                          MaxWidth="320"
-                          Opened="Dialog_Opened"
-                          Closed="Dialog_Closed">
+        <ui:ContentDialog
+            x:Name="EditLayoutDialog"
+            MaxWidth="320"
+            Background="{DynamicResource PrimaryBackgroundBrush}"
+            Closed="Dialog_Closed"
+            Opened="Dialog_Opened"
+            PrimaryButtonClick="EditLayoutDialog_PrimaryButtonClick"
+            PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
+            PrimaryButtonText="{x:Static props:Resources.Save}"
+            ScrollViewer.VerticalScrollBarVisibility="Auto"
+            SecondaryButtonClick="EditLayoutDialog_SecondaryButtonClick"
+            SecondaryButtonText="{x:Static props:Resources.Cancel}">
             <ui:ContentDialog.Title>
-                <local:HeadingTextBlock 
-                    x:Name="EditLayoutDialogTitle" 
-                    MaxWidth="320" 
-                    Margin="0,0,96,0" 
-                    Style="{StaticResource HeadingTextBlock}" 
-                    Loaded="EditLayoutDialogTitle_Loaded" 
-                    AutomationProperties.HeadingLevel="Level1"/>
+                <local:HeadingTextBlock
+                    x:Name="EditLayoutDialogTitle"
+                    MaxWidth="320"
+                    Margin="0,0,96,0"
+                    AutomationProperties.HeadingLevel="Level1"
+                    Loaded="EditLayoutDialogTitle_Loaded"
+                    Style="{StaticResource HeadingTextBlock}" />
             </ui:ContentDialog.Title>
-            <Grid DataContext="{Binding SelectedModel}"
-                 Margin="4,4,24,32">
+            <Grid Margin="4,4,24,32" DataContext="{Binding SelectedModel}">
 
-                <StackPanel Margin="0,-37,0,0"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Top"
-                            Orientation="Horizontal">
-                    <Button Click="DuplicateLayout_Click"
-                            x:Name="duplicateLayoutButton"
-                            AutomationProperties.Name="{x:Static props:Resources.Duplicate}"
-                            ToolTip="{x:Static props:Resources.Duplicate}"
-                            Style="{StaticResource IconOnlyButtonStyle}"
-                            Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
-                        <Button.Content>
-                            <TextBlock Text="&#xE8C8;"
-                                       FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                       FontSize="16"
-                                       AutomationProperties.Name="{x:Static props:Resources.Duplicate}" />
-                        </Button.Content>
-                    </Button>
-                    <!--Used by narrator for announcements-->
-                    <TextBlock x:Name="LayoutCreationAnnounce" />
-                    <Button Click="DuplicateLayout_Click"
-                            x:Name="createFromTemplateLayoutButton"
-                            AutomationProperties.Name="{x:Static props:Resources.Create_Custom_From_Template}"
-                            ToolTip="{x:Static props:Resources.Create_Custom_From_Template}"
-                            Style="{StaticResource IconOnlyButtonStyle}"
-                            Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeTemplateToVisibilityConverter}}">
-                        <Button.Content>
-                            <TextBlock Text="&#xE8C8;"
-                                       FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                       FontSize="16"
-                                       AutomationProperties.Name="{x:Static props:Resources.Create_Custom_From_Template}" />
-                        </Button.Content>
-                    </Button>
-
-                    <Button Click="DeleteLayout_Click"
-                        x:Name="deleteLayoutButton"
-                        AutomationProperties.Name="{x:Static props:Resources.Delete}"
-                        ToolTip="{x:Static props:Resources.Delete}"   
+                <StackPanel
+                    Margin="0,-37,0,0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Orientation="Horizontal">
+                    <Button
+                        x:Name="duplicateLayoutButton"
+                        AutomationProperties.Name="{x:Static props:Resources.Duplicate}"
+                        Click="DuplicateLayout_Click"
                         Style="{StaticResource IconOnlyButtonStyle}"
+                        ToolTip="{x:Static props:Resources.Duplicate}"
                         Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
                         <Button.Content>
-                            <TextBlock Text="&#xE74D;"
-                                       FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                       FontSize="16"
-                                       Foreground="#C42B1C"
-                                       AutomationProperties.Name="{x:Static props:Resources.Delete}" />
+                            <TextBlock
+                                AutomationProperties.Name="{x:Static props:Resources.Duplicate}"
+                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                FontSize="16"
+                                Text="&#xE8C8;" />
+                        </Button.Content>
+                    </Button>
+                    <!--  Used by narrator for announcements  -->
+                    <TextBlock x:Name="LayoutCreationAnnounce" />
+                    <Button
+                        x:Name="createFromTemplateLayoutButton"
+                        AutomationProperties.Name="{x:Static props:Resources.Create_Custom_From_Template}"
+                        Click="DuplicateLayout_Click"
+                        Style="{StaticResource IconOnlyButtonStyle}"
+                        ToolTip="{x:Static props:Resources.Create_Custom_From_Template}"
+                        Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeTemplateToVisibilityConverter}}">
+                        <Button.Content>
+                            <TextBlock
+                                AutomationProperties.Name="{x:Static props:Resources.Create_Custom_From_Template}"
+                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                FontSize="16"
+                                Text="&#xE8C8;" />
+                        </Button.Content>
+                    </Button>
+
+                    <Button
+                        x:Name="deleteLayoutButton"
+                        AutomationProperties.Name="{x:Static props:Resources.Delete}"
+                        Click="DeleteLayout_Click"
+                        Style="{StaticResource IconOnlyButtonStyle}"
+                        ToolTip="{x:Static props:Resources.Delete}"
+                        Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
+                        <Button.Content>
+                            <TextBlock
+                                AutomationProperties.Name="{x:Static props:Resources.Delete}"
+                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                FontSize="16"
+                                Foreground="#C42B1C"
+                                Text="&#xE74D;" />
                         </Button.Content>
                     </Button>
                 </StackPanel>
 
                 <StackPanel>
-                    <StackPanel Orientation="Horizontal"
-                                Margin="0,24,0,0"
-                                HorizontalAlignment="Stretch"
-                                Visibility="{Binding IsCustom, Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <StackPanel
+                        Margin="0,24,0,0"
+                        HorizontalAlignment="Stretch"
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsCustom, Converter={StaticResource BooleanToVisibilityConverter}}">
+
+                        <TextBlock
+                            Margin="0,0,0,8"
+                            VerticalAlignment="Bottom"
+                            AutomationProperties.Name="{x:Static props:Resources.Name}"
+                            FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                            FontSize="16"
+                            Text="&#xE932;"
+                            ToolTip="{x:Static props:Resources.Name}" />
+                        <TextBox
+                            MinWidth="286"
+                            MaxWidth="286"
+                            Margin="12,0,0,0"
+                            HorizontalAlignment="Stretch"
+                            ui:ControlHelper.Header="{x:Static props:Resources.Name}"
+                            ui:ControlHelper.PlaceholderText="{x:Static props:Resources.Name}"
+                            AutomationProperties.Name="{x:Static props:Resources.Name}"
+                            GotKeyboardFocus="TextBox_GotKeyboardFocus"
+                            Text="{Binding Name}" />
 
-                        <TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                   ToolTip="{x:Static props:Resources.Name}"
-                                   FontSize="16"
-                                   VerticalAlignment="Bottom" Margin="0,0,0,8"
-                                   AutomationProperties.Name="{x:Static props:Resources.Name}"
-                                   Text="&#xE932;" />
-                        <TextBox Text="{Binding Name}"
-                                 ui:ControlHelper.PlaceholderText="{x:Static props:Resources.Name}"
-                                 AutomationProperties.Name="{x:Static props:Resources.Name}"
-                                 Margin="12,0,0,0"
-                                 ui:ControlHelper.Header="{x:Static props:Resources.Name}"
-                                 MinWidth="286"
-                                 MaxWidth="286"
-                                 HorizontalAlignment="Stretch"
-                                 GotKeyboardFocus="TextBox_GotKeyboardFocus" />
 
-              
                     </StackPanel>
 
-                    <!-- Shortcut panel -->
-                    <StackPanel Orientation="Vertical"
-                                Visibility="{Binding IsCustom, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                Margin="0,12,0,36">
+                    <!--  Shortcut panel  -->
+                    <StackPanel
+                        Margin="0,12,0,36"
+                        Orientation="Vertical"
+                        Visibility="{Binding IsCustom, Converter={StaticResource BooleanToVisibilityConverter}}">
 
-                        <StackPanel Margin="28,0,0,4"
-                                    Orientation="Horizontal">
-                            <TextBlock x:Name="QuickKeyTitle"
-                                       Text="{x:Static props:Resources.QuickKey_Title}" />
-                            <TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                       Margin="8,4,0,0"
-                                       Foreground="{DynamicResource SystemControlBackgroundAccentBrush}"
-                                       Text="&#xE946;"
-                                       AutomationProperties.Name="{x:Static props:Resources.QuickKey_Description}"
-                                       ToolTip="{x:Static props:Resources.QuickKey_Description}"
-                                       ToolTipService.InitialShowDelay="0"/>
+                        <StackPanel Margin="28,0,0,4" Orientation="Horizontal">
+                            <TextBlock x:Name="QuickKeyTitle" Text="{x:Static props:Resources.QuickKey_Title}" />
+                            <TextBlock
+                                Margin="8,4,0,0"
+                                AutomationProperties.Name="{x:Static props:Resources.QuickKey_Description}"
+                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                Foreground="{DynamicResource SystemControlBackgroundAccentBrush}"
+                                Text="&#xE946;"
+                                ToolTip="{x:Static props:Resources.QuickKey_Description}"
+                                ToolTipService.InitialShowDelay="0" />
                         </StackPanel>
 
 
                         <StackPanel Orientation="Horizontal">
 
-                            <TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                       VerticalAlignment="Center"
-                                       FontSize="16"
-                                       ToolTip="{x:Static props:Resources.QuickKey_Title}"
-                                       AutomationProperties.Name="{x:Static props:Resources.QuickKey_Title}"
-                                       Text="&#xEDA7;" />
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                AutomationProperties.Name="{x:Static props:Resources.QuickKey_Title}"
+                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                FontSize="16"
+                                Text="&#xEDA7;"
+                                ToolTip="{x:Static props:Resources.QuickKey_Title}" />
 
-                            <ComboBox x:Name="quickKeySelectionComboBox"
-                                      Margin="12,0,0,0"
-                                      Width="286"
-                                      AutomationProperties.LabeledBy="{Binding ElementName=QuickKeyTitle}"
-                                      AutomationProperties.HelpText="{x:Static props:Resources.QuickKey_Description}"
-                                      AutomationProperties.Name="{x:Static props:Resources.QuickKey_Title}"
-                                      ItemsSource="{Binding QuickKeysAvailable}"
-                                      KeyDown="ComboBox_KeyDown"
-                                      SelectedItem="{Binding QuickKey}" />
+                            <ComboBox
+                                x:Name="quickKeySelectionComboBox"
+                                Width="286"
+                                Margin="12,0,0,0"
+                                AutomationProperties.HelpText="{x:Static props:Resources.QuickKey_Description}"
+                                AutomationProperties.LabeledBy="{Binding ElementName=QuickKeyTitle}"
+                                AutomationProperties.Name="{x:Static props:Resources.QuickKey_Title}"
+                                ItemsSource="{Binding QuickKeysAvailable}"
+                                KeyDown="ComboBox_KeyDown"
+                                SelectedItem="{Binding QuickKey}" />
                         </StackPanel>
 
                     </StackPanel>
 
-                    <Grid  Width="218"
-                           Height="124"
-                           HorizontalAlignment="Left"
-                           Margin="24,12,0,24">
+                    <Grid
+                        Width="218"
+                        Height="124"
+                        Margin="24,12,0,24"
+                        HorizontalAlignment="Left">
                         <local:LayoutPreview />
 
-                        <Button Content="&#xE70F;"
-                                x:Name="editZoneLayoutButton"
-                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                FontSize="16"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Height="36"
-                                Width="36"
-                                Padding="0"
-                                BorderBrush="Transparent"
-                                Click="EditZones_Click"
-                                Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}"
-                                ToolTip="{x:Static props:Resources.Edit_zones}"
-                                AutomationProperties.Name="{x:Static props:Resources.Edit_zones}"
-                                Style="{StaticResource AccentButtonStyle}"
-                                ui:ControlHelper.CornerRadius="36">
-                        </Button>
+                        <Button
+                            x:Name="editZoneLayoutButton"
+                            Width="36"
+                            Height="36"
+                            Padding="0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            ui:ControlHelper.CornerRadius="36"
+                            AutomationProperties.Name="{x:Static props:Resources.Edit_zones}"
+                            BorderBrush="Transparent"
+                            Click="EditZones_Click"
+                            Content="&#xE70F;"
+                            FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                            FontSize="16"
+                            Style="{StaticResource AccentButtonStyle}"
+                            ToolTip="{x:Static props:Resources.Edit_zones}"
+                            Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}" />
 
                     </Grid>
 
 
-                    <StackPanel Orientation="Horizontal"
-                                HorizontalAlignment="Left"
-                                Margin="0,16,0,0"
-                                Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeTemplateToVisibilityConverter}}">
+                    <StackPanel
+                        Margin="0,16,0,0"
+                        HorizontalAlignment="Left"
+                        Orientation="Horizontal"
+                        Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeTemplateToVisibilityConverter}}">
 
-                        <TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                   VerticalAlignment="Center"
-                                   FontSize="16"
-                                   Margin="0,16,0,0"
-                                   AutomationProperties.Name="{x:Static props:Resources.Number_of_zones}"
-                                   ToolTip="{x:Static props:Resources.Number_of_zones}"
-                                   Text="&#xECA5;" />
+                        <TextBlock
+                            Margin="0,16,0,0"
+                            VerticalAlignment="Center"
+                            AutomationProperties.Name="{x:Static props:Resources.Number_of_zones}"
+                            FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                            FontSize="16"
+                            Text="&#xECA5;"
+                            ToolTip="{x:Static props:Resources.Number_of_zones}" />
 
                         <StackPanel Orientation="Vertical">
-                            <TextBlock Text="{x:Static props:Resources.Number_of_zones}"
-                                   x:Name="templateZoneCountTitle"
-                                   Margin="12,0,0,4"
-                                   TextWrapping="Wrap" />
+                            <TextBlock
+                                x:Name="templateZoneCountTitle"
+                                Margin="12,0,0,4"
+                                Text="{x:Static props:Resources.Number_of_zones}"
+                                TextWrapping="Wrap" />
 
                             <StackPanel Orientation="Horizontal">
-                                <fancyZonesControls:CustomSlider x:Name="TemplateZoneCount"
-                                    Value="{Binding TemplateZoneCount}"
-                                    Minimum="{Binding TemplateZoneCountMinimum}"
-                                    Maximum="{Binding TemplateZoneCountMaximum}"
-                                    IsMoveToPointEnabled="True"
-                                    AutomationProperties.HelpText="{x:Static props:Resources.Number_of_zones}"
-                                    ToolTip="{Binding TemplateZoneCount}"
-                                    ValueChanged="TemplateZoneCount_ValueChanged"
+                                <fancyZonesControls:CustomSlider
+                                    x:Name="TemplateZoneCount"
                                     MinWidth="216"
                                     Margin="12,0,0,0"
                                     HorizontalAlignment="Left"
-                                    SmallChange="1" 
-                                    LargeChange="10"/>
+                                    AutomationProperties.HelpText="{x:Static props:Resources.Number_of_zones}"
+                                    IsMoveToPointEnabled="True"
+                                    LargeChange="10"
+                                    Maximum="{Binding TemplateZoneCountMaximum}"
+                                    Minimum="{Binding TemplateZoneCountMinimum}"
+                                    SmallChange="1"
+                                    ToolTip="{Binding TemplateZoneCount}"
+                                    ValueChanged="TemplateZoneCount_ValueChanged"
+                                    Value="{Binding TemplateZoneCount}" />
 
-                                <TextBlock Text="{Binding TemplateZoneCount}"
+                                <TextBlock
                                     Margin="6,0,0,0"
+                                    VerticalAlignment="Center"
                                     FontSize="12"
                                     Foreground="{DynamicResource SecondaryForegroundBrush}"
-                                    TextWrapping="Wrap"
-                                    VerticalAlignment="Center" />
+                                    Text="{Binding TemplateZoneCount}"
+                                    TextWrapping="Wrap" />
 
-                                <TextBlock Text="{x:Static props:Resources.Zones}"
-                                       Margin="6,0,0,0"
-                                       FontSize="12"
-                                       Foreground="{DynamicResource SecondaryForegroundBrush}"
-                                       TextWrapping="Wrap"
-                                       VerticalAlignment="Center" />
+                                <TextBlock
+                                    Margin="6,0,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="12"
+                                    Foreground="{DynamicResource SecondaryForegroundBrush}"
+                                    Text="{x:Static props:Resources.Zones}"
+                                    TextWrapping="Wrap" />
                             </StackPanel>
                         </StackPanel>
                     </StackPanel>
 
-                    <StackPanel Margin="0, 12, 0, 0"
-                                Visibility="{Binding Converter={StaticResource LayoutModelTypeToVisibilityConverter}}">
-                        <TextBlock Text="{x:Static props:Resources.Space_Around_Zones}"
-                                   x:Name="spacingTitle"
-                                   Margin="28,0,0,4"
-                                   TextWrapping="Wrap" />
+                    <StackPanel Margin="0,12,0,0" Visibility="{Binding Converter={StaticResource LayoutModelTypeToVisibilityConverter}}">
+                        <TextBlock
+                            x:Name="spacingTitle"
+                            Margin="28,0,0,4"
+                            Text="{x:Static props:Resources.Space_Around_Zones}"
+                            TextWrapping="Wrap" />
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                       VerticalAlignment="Center"
-                                       FontSize="16"
-                                       AutomationProperties.Name="{x:Static props:Resources.Space_Around_Zones}"
-                                       ToolTip="{x:Static props:Resources.Space_Around_Zones}"
-                                       Text="&#xE91B;" />
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                AutomationProperties.Name="{x:Static props:Resources.Space_Around_Zones}"
+                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                FontSize="16"
+                                Text="&#xE91B;"
+                                ToolTip="{x:Static props:Resources.Space_Around_Zones}" />
 
                             <StackPanel Orientation="Horizontal">
-                                <fancyZonesControls:CustomSlider x:Name="Spacing"
-                                    Value="{Binding Spacing}"
-                                    Minimum="{Binding SpacingMinimum}"
-                                    Maximum="{Binding SpacingMaximum}"
-                                    IsMoveToPointEnabled="True"
-                                    AutomationProperties.HelpText="{x:Static props:Resources.Space_Around_Zones}"
-                                    ToolTip="{Binding Spacing}"
-                                    ValueChanged="Spacing_ValueChanged"
-                                    IsEnabled="{Binding ShowSpacing}"
+                                <fancyZonesControls:CustomSlider
+                                    x:Name="Spacing"
                                     MinWidth="216"
                                     Margin="12,0,0,0"
                                     HorizontalAlignment="Left"
-                                    SmallChange="1" 
-                                    LargeChange="10"/>
+                                    AutomationProperties.HelpText="{x:Static props:Resources.Space_Around_Zones}"
+                                    IsEnabled="{Binding ShowSpacing}"
+                                    IsMoveToPointEnabled="True"
+                                    LargeChange="10"
+                                    Maximum="{Binding SpacingMaximum}"
+                                    Minimum="{Binding SpacingMinimum}"
+                                    SmallChange="1"
+                                    ToolTip="{Binding Spacing}"
+                                    ValueChanged="Spacing_ValueChanged"
+                                    Value="{Binding Spacing}" />
 
-                                <TextBlock Text="{Binding Spacing}"
+                                <TextBlock
                                     Margin="6,0,0,0"
+                                    VerticalAlignment="Center"
                                     FontSize="12"
                                     Foreground="{DynamicResource SecondaryForegroundBrush}"
-                                    TextWrapping="Wrap"
-                                    VerticalAlignment="Center"/>
+                                    Text="{Binding Spacing}"
+                                    TextWrapping="Wrap" />
 
-                                <TextBlock Text="{x:Static props:Resources.Pixels}"
-                                       Margin="6,0,0,0"
-                                       FontSize="12"
-                                       Foreground="{DynamicResource SecondaryForegroundBrush}"
-                                       TextWrapping="Wrap"
-                                       VerticalAlignment="Center" />
+                                <TextBlock
+                                    Margin="6,0,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="12"
+                                    Foreground="{DynamicResource SecondaryForegroundBrush}"
+                                    Text="{x:Static props:Resources.Pixels}"
+                                    TextWrapping="Wrap" />
                             </StackPanel>
 
-                            <ui:ToggleSwitch x:Name="spaceAroundSetting"
-                                             IsOn="{Binding ShowSpacing}"
-                                             Margin="12,0,0,0"
-                                             OffContent=""
-                                             OnContent=""
-                                             ui:FocusVisualHelper.FocusVisualMargin="-3,-3,8,-3"
-                                             VerticalAlignment="Center"
-                                             AutomationProperties.Name="{x:Static props:Resources.Show_Space_Zones}">
+                            <ui:ToggleSwitch
+                                x:Name="spaceAroundSetting"
+                                Margin="12,0,0,0"
+                                VerticalAlignment="Center"
+                                ui:FocusVisualHelper.FocusVisualMargin="-3,-3,8,-3"
+                                AutomationProperties.Name="{x:Static props:Resources.Show_Space_Zones}"
+                                IsOn="{Binding ShowSpacing}"
+                                OffContent=""
+                                OnContent="">
                                 <ui:ToggleSwitch.Resources>
                                     <sys:Double x:Key="ToggleSwitchThemeMinWidth">0</sys:Double>
                                 </ui:ToggleSwitch.Resources>
@@ -629,108 +673,113 @@
                         </StackPanel>
                     </StackPanel>
 
-                    <StackPanel Margin="0, 12, 0, 0">
-                        <TextBlock Text="{x:Static props:Resources.Distance_adjacent_zones}"
-                                   x:Name="distanceTitle"
-                                   Margin="28,0,0,4"
-                                   TextWrapping="Wrap" />
+                    <StackPanel Margin="0,12,0,0">
+                        <TextBlock
+                            x:Name="distanceTitle"
+                            Margin="28,0,0,4"
+                            Text="{x:Static props:Resources.Distance_adjacent_zones}"
+                            TextWrapping="Wrap" />
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                       VerticalAlignment="Center"
-                                       FontSize="16"
-                                       ToolTip="{x:Static props:Resources.Distance_adjacent_zones}"
-                                       Text="&#xE78A;" />
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                FontSize="16"
+                                Text="&#xE78A;"
+                                ToolTip="{x:Static props:Resources.Distance_adjacent_zones}" />
 
-                            <fancyZonesControls:CustomSlider x:Name="SensitivityInput"
-                                Value="{Binding SensitivityRadius}"
-                                Minimum="{Binding SensitivityRadiusMinimum}"
-                                Maximum="{Binding SensitivityRadiusMaximum}"
-                                IsMoveToPointEnabled="True"
-                                AutomationProperties.HelpText="{x:Static props:Resources.Distance_adjacent_zones}"
-                                ToolTip="{Binding SensitivityRadius}"
-                                ValueChanged="SensitivityInput_ValueChanged"
+                            <fancyZonesControls:CustomSlider
+                                x:Name="SensitivityInput"
                                 MinWidth="216"
                                 Margin="12,0,0,0"
                                 HorizontalAlignment="Left"
-                                SmallChange="1" 
+                                AutomationProperties.HelpText="{x:Static props:Resources.Distance_adjacent_zones}"
+                                DockPanel.Dock="Top"
+                                IsMoveToPointEnabled="True"
                                 LargeChange="10"
-                                DockPanel.Dock="Top"/>
+                                Maximum="{Binding SensitivityRadiusMaximum}"
+                                Minimum="{Binding SensitivityRadiusMinimum}"
+                                SmallChange="1"
+                                ToolTip="{Binding SensitivityRadius}"
+                                ValueChanged="SensitivityInput_ValueChanged"
+                                Value="{Binding SensitivityRadius}" />
 
-                                <TextBlock
-                                    Text="{Binding SensitivityRadius}"
-                                    Margin="6,0,0,0"
-                                    FontSize="12"
-                                    Foreground="{DynamicResource SecondaryForegroundBrush}"
-                                    TextWrapping="Wrap"
-                                    VerticalAlignment="Center"/>
+                            <TextBlock
+                                Margin="6,0,0,0"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="{DynamicResource SecondaryForegroundBrush}"
+                                Text="{Binding SensitivityRadius}"
+                                TextWrapping="Wrap" />
 
-                                <TextBlock Text="{x:Static props:Resources.Pixels}"
-                                       Margin="6,0,0,0"
-                                       FontSize="12"
-                                       Foreground="{DynamicResource SecondaryForegroundBrush}"
-                                       TextWrapping="Wrap"
-                                       VerticalAlignment="Center" />
+                            <TextBlock
+                                Margin="6,0,0,0"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Foreground="{DynamicResource SecondaryForegroundBrush}"
+                                Text="{x:Static props:Resources.Pixels}"
+                                TextWrapping="Wrap" />
                         </StackPanel>
                     </StackPanel>
 
-                    <StackPanel Orientation="Vertical"
-                                HorizontalAlignment="Left"
-                                Margin="0,16,0,0">
+                    <StackPanel
+                        Margin="0,16,0,0"
+                        HorizontalAlignment="Left"
+                        Orientation="Vertical">
 
-                        <Button x:Name="SetLayoutAsHorizontalDefaultButton"
-                            Click="SetLayoutAsHorizontalDefaultButton_Click"
+                        <Button
+                            x:Name="SetLayoutAsHorizontalDefaultButton"
                             AutomationProperties.Name="{x:Static props:Resources.Set_Layout_As_Horizontal_Default}"
-                            ToolTip="{x:Static props:Resources.Set_Layout_As_Horizontal_Default}"
+                            Click="SetLayoutAsHorizontalDefaultButton_Click"
                             Style="{StaticResource IconOnlyButtonStyle}"
+                            ToolTip="{x:Static props:Resources.Set_Layout_As_Horizontal_Default}"
                             Visibility="{Binding CanBeSetAsHorizontalDefault, Converter={StaticResource BooleanToVisibilityConverter}}">
                             <Button.Content>
-                                <TextBlock AutomationProperties.Name="{x:Static props:Resources.Set_Layout_As_Horizontal_Default}"
-                                       FontSize="16">
-                                    <Run Text="&#xE734;" FontFamily="{DynamicResource SymbolThemeFontFamily}"/>
-                                    <Run Text="{x:Static props:Resources.Default_Layout_Horizontal}"/>
+                                <TextBlock AutomationProperties.Name="{x:Static props:Resources.Set_Layout_As_Horizontal_Default}" FontSize="16">
+                                    <Run FontFamily="{DynamicResource SymbolThemeFontFamily}" Text="&#xE734;" />
+                                    <Run Text="{x:Static props:Resources.Default_Layout_Horizontal}" />
                                 </TextBlock>
                             </Button.Content>
                         </Button>
-                        <Button x:Name="HorizontalDefaultLayoutButton"
-                            Click="HorizontalDefaultLayoutButton_Click"
-                            ToolTip="{x:Static props:Resources.Default_Layout_Horizontal}"
+                        <Button
+                            x:Name="HorizontalDefaultLayoutButton"
                             AutomationProperties.Name="{x:Static props:Resources.Default_Layout_Horizontal}"
+                            Click="HorizontalDefaultLayoutButton_Click"
                             Style="{StaticResource IconOnlyButtonStyle}"
+                            ToolTip="{x:Static props:Resources.Default_Layout_Horizontal}"
                             Visibility="{Binding IsHorizontalDefault, Converter={StaticResource BooleanToVisibilityConverter}}">
                             <Button.Content>
-                                <TextBlock AutomationProperties.Name="{x:Static props:Resources.Default_Layout_Horizontal}"
-                                       FontSize="16">
-                                    <Run Text="&#xE735;" FontFamily="{DynamicResource SymbolThemeFontFamily}"/>
-                                    <Run Text="{x:Static props:Resources.Default_Layout_Horizontal}"/>
+                                <TextBlock AutomationProperties.Name="{x:Static props:Resources.Default_Layout_Horizontal}" FontSize="16">
+                                    <Run FontFamily="{DynamicResource SymbolThemeFontFamily}" Text="&#xE735;" />
+                                    <Run Text="{x:Static props:Resources.Default_Layout_Horizontal}" />
                                 </TextBlock>
                             </Button.Content>
                         </Button>
 
-                        <Button x:Name="SetLayoutAsVerticalDefaultButton"
-                            Click="SetLayoutAsVerticalDefaultButton_Click"
+                        <Button
+                            x:Name="SetLayoutAsVerticalDefaultButton"
                             AutomationProperties.Name="{x:Static props:Resources.Set_Layout_As_Vertical_Default}"
-                            ToolTip="{x:Static props:Resources.Set_Layout_As_Vertical_Default}"
+                            Click="SetLayoutAsVerticalDefaultButton_Click"
                             Style="{StaticResource IconOnlyButtonStyle}"
+                            ToolTip="{x:Static props:Resources.Set_Layout_As_Vertical_Default}"
                             Visibility="{Binding CanBeSetAsVerticalDefault, Converter={StaticResource BooleanToVisibilityConverter}}">
                             <Button.Content>
-                                <TextBlock AutomationProperties.Name="{x:Static props:Resources.Set_Layout_As_Vertical_Default}"
-                                       FontSize="16">
-                                    <Run Text="&#xE734;" FontFamily="{DynamicResource SymbolThemeFontFamily}"/>
-                                    <Run Text="{x:Static props:Resources.Default_Layout_Vertical}"/>
+                                <TextBlock AutomationProperties.Name="{x:Static props:Resources.Set_Layout_As_Vertical_Default}" FontSize="16">
+                                    <Run FontFamily="{DynamicResource SymbolThemeFontFamily}" Text="&#xE734;" />
+                                    <Run Text="{x:Static props:Resources.Default_Layout_Vertical}" />
                                 </TextBlock>
                             </Button.Content>
                         </Button>
-                        <Button x:Name="VerticalDefaultLayoutButton"
-                            Click="VerticalDefaultLayoutButton_Click"
-                            ToolTip="{x:Static props:Resources.Default_Layout_Vertical}"
+                        <Button
+                            x:Name="VerticalDefaultLayoutButton"
                             AutomationProperties.Name="{x:Static props:Resources.Default_Layout_Vertical}"
+                            Click="VerticalDefaultLayoutButton_Click"
                             Style="{StaticResource IconOnlyButtonStyle}"
+                            ToolTip="{x:Static props:Resources.Default_Layout_Vertical}"
                             Visibility="{Binding IsVerticalDefault, Converter={StaticResource BooleanToVisibilityConverter}}">
                             <Button.Content>
-                                <TextBlock AutomationProperties.Name="{x:Static props:Resources.Default_Layout_Vertical}"
-                                       FontSize="16">
-                                    <Run Text="&#xE735;" FontFamily="{DynamicResource SymbolThemeFontFamily}"/>
-                                    <Run Text="{x:Static props:Resources.Default_Layout_Vertical}"/>
+                                <TextBlock AutomationProperties.Name="{x:Static props:Resources.Default_Layout_Vertical}" FontSize="16">
+                                    <Run FontFamily="{DynamicResource SymbolThemeFontFamily}" Text="&#xE735;" />
+                                    <Run Text="{x:Static props:Resources.Default_Layout_Vertical}" />
                                 </TextBlock>
                             </Button.Content>
                         </Button>
@@ -739,101 +788,107 @@
                 </StackPanel>
             </Grid>
         </ui:ContentDialog>
-        
-        <ui:ContentDialog x:Name="NewLayoutDialog"
-                          Background="{DynamicResource PrimaryBackgroundBrush}"
-                          PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
-                          SecondaryButtonText="{x:Static props:Resources.Cancel}"
-                          PrimaryButtonText="{x:Static props:Resources.Create}"
-                          PrimaryButtonClick="NewLayoutDialog_PrimaryButtonClick"
-                          IsPrimaryButtonEnabled="{Binding ElementName=LayoutNameText, Path=Text.Length}"
-                          Opened="Dialog_Opened"
-                          Closed="Dialog_Closed">
+
+        <ui:ContentDialog
+            x:Name="NewLayoutDialog"
+            Background="{DynamicResource PrimaryBackgroundBrush}"
+            Closed="Dialog_Closed"
+            IsPrimaryButtonEnabled="{Binding ElementName=LayoutNameText, Path=Text.Length}"
+            Opened="Dialog_Opened"
+            PrimaryButtonClick="NewLayoutDialog_PrimaryButtonClick"
+            PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
+            PrimaryButtonText="{x:Static props:Resources.Create}"
+            SecondaryButtonText="{x:Static props:Resources.Cancel}">
             <ui:ContentDialog.TitleTemplate>
                 <DataTemplate>
-                    <local:HeadingTextBlock Text="{x:Static props:Resources.Choose_layout_type}"
-                       AutomationProperties.HeadingLevel="Level1"
-                       Style="{StaticResource HeadingTextBlock}" />
+                    <local:HeadingTextBlock
+                        AutomationProperties.HeadingLevel="Level1"
+                        Style="{StaticResource HeadingTextBlock}"
+                        Text="{x:Static props:Resources.Choose_layout_type}" />
                 </DataTemplate>
             </ui:ContentDialog.TitleTemplate>
             <StackPanel Margin="0,16,24,0">
-                    <TextBlock x:Name="NameHeaderText"
-                           Text="{x:Static props:Resources.Name}" />
-                <TextBox Margin="3,6,3,0"
-                         x:Name="LayoutNameText"
-                         AutomationProperties.LabeledBy="{Binding ElementName=NameHeaderText}" />
-                <RadioButton x:Name="GridLayoutRadioButton"
-                             GroupName="LayoutTypeGroup"
-                             AutomationProperties.Name="{x:Static props:Resources.Layout_Grid_Title}"
-                             AutomationProperties.HelpText="{x:Static props:Resources.Layout_Grid_Description}"
-                             IsChecked="True"
-                             Margin="0,24,0,0"
-                             Style="{StaticResource LayoutTypeRadioButtonStyle}">
+                <TextBlock x:Name="NameHeaderText" Text="{x:Static props:Resources.Name}" />
+                <TextBox
+                    x:Name="LayoutNameText"
+                    Margin="3,6,3,0"
+                    AutomationProperties.LabeledBy="{Binding ElementName=NameHeaderText}" />
+                <RadioButton
+                    x:Name="GridLayoutRadioButton"
+                    Margin="0,24,0,0"
+                    AutomationProperties.HelpText="{x:Static props:Resources.Layout_Grid_Description}"
+                    AutomationProperties.Name="{x:Static props:Resources.Layout_Grid_Title}"
+                    GroupName="LayoutTypeGroup"
+                    IsChecked="True"
+                    Style="{StaticResource LayoutTypeRadioButtonStyle}">
                     <RadioButton.Content>
-                        <Grid Width="420"
-                              Margin="4">
+                        <Grid Width="420" Margin="4">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="32" />
                                 <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
-                            <TextBlock Text="&#xF0E2;"
-                                       FontSize="16"
-                                       Foreground="{DynamicResource SystemControlBackgroundAccentBrush}"
-                                       Margin="0,4,0,0"
-                                       AutomationProperties.Name="{x:Static props:Resources.Layout_Grid_Title}"
-                                       HorizontalAlignment="Left"
-                                       FontFamily="{DynamicResource SymbolThemeFontFamily}" />
-                            <StackPanel Grid.Column="1"
-                                        Orientation="Vertical">
-                                <TextBlock TextWrapping="Wrap"
-                                           FontWeight="Bold"
-                                           Margin="0,3,0,0"
-                                           Text="{x:Static props:Resources.Layout_Grid_Title}" />
-                                <TextBlock TextWrapping="Wrap"
-                                           Margin="0,4,0,0"
-                                           Text="{x:Static props:Resources.Layout_Grid_Description}"
-                                           Foreground="{DynamicResource SecondaryForegroundBrush}" />
+                            <TextBlock
+                                Margin="0,4,0,0"
+                                HorizontalAlignment="Left"
+                                AutomationProperties.Name="{x:Static props:Resources.Layout_Grid_Title}"
+                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                FontSize="16"
+                                Foreground="{DynamicResource SystemControlBackgroundAccentBrush}"
+                                Text="&#xF0E2;" />
+                            <StackPanel Grid.Column="1" Orientation="Vertical">
+                                <TextBlock
+                                    Margin="0,3,0,0"
+                                    FontWeight="Bold"
+                                    Text="{x:Static props:Resources.Layout_Grid_Title}"
+                                    TextWrapping="Wrap" />
+                                <TextBlock
+                                    Margin="0,4,0,0"
+                                    Foreground="{DynamicResource SecondaryForegroundBrush}"
+                                    Text="{x:Static props:Resources.Layout_Grid_Description}"
+                                    TextWrapping="Wrap" />
                             </StackPanel>
                         </Grid>
                     </RadioButton.Content>
                 </RadioButton>
 
-                <RadioButton x:Name="CanvasLayoutRadioButton"
-                             GroupName="LayoutTypeGroup"
-                             IsChecked="True"
-                             AutomationProperties.Name="{x:Static props:Resources.Layout_Canvas_Title}"
-                             AutomationProperties.HelpText="{x:Static props:Resources.Layout_Canvas_Description}"
-                             Style="{StaticResource LayoutTypeRadioButtonStyle}"
-                             Margin="0,0,0,64">
+                <RadioButton
+                    x:Name="CanvasLayoutRadioButton"
+                    Margin="0,0,0,64"
+                    AutomationProperties.HelpText="{x:Static props:Resources.Layout_Canvas_Description}"
+                    AutomationProperties.Name="{x:Static props:Resources.Layout_Canvas_Title}"
+                    GroupName="LayoutTypeGroup"
+                    IsChecked="True"
+                    Style="{StaticResource LayoutTypeRadioButtonStyle}">
                     <RadioButton.Content>
-                        <Grid Width="420"
-                              Margin="4">
+                        <Grid Width="420" Margin="4">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="32" />
                                 <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
-                            <TextBlock Text="&#xF5ED;"
-                                       FontSize="16"
-                                       Foreground="{DynamicResource SystemControlBackgroundAccentBrush}"
-                                       AutomationProperties.Name="{x:Static props:Resources.Layout_Canvas_Title}"
-                                       Margin="0,4,0,0"
-                                       HorizontalAlignment="Left"
-                                       FontFamily="{DynamicResource SymbolThemeFontFamily}" />
-                            <StackPanel Grid.Column="1"
-                                        Orientation="Vertical">
-                                <TextBlock TextWrapping="Wrap"
-                                           FontWeight="Bold"
-                                           Margin="0,3,0,0"
-                                           Text="{x:Static props:Resources.Layout_Canvas_Title}" />
-                                <TextBlock TextWrapping="Wrap"
-                                           Margin="0,4,0,0"
-                                           Text="{x:Static props:Resources.Layout_Canvas_Description}"
-                                           Foreground="{DynamicResource SecondaryForegroundBrush}" />
-                                </StackPanel>
-                            </Grid>
-                        </RadioButton.Content>
-                    </RadioButton>
-                </StackPanel>
+                            <TextBlock
+                                Margin="0,4,0,0"
+                                HorizontalAlignment="Left"
+                                AutomationProperties.Name="{x:Static props:Resources.Layout_Canvas_Title}"
+                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                FontSize="16"
+                                Foreground="{DynamicResource SystemControlBackgroundAccentBrush}"
+                                Text="&#xF5ED;" />
+                            <StackPanel Grid.Column="1" Orientation="Vertical">
+                                <TextBlock
+                                    Margin="0,3,0,0"
+                                    FontWeight="Bold"
+                                    Text="{x:Static props:Resources.Layout_Canvas_Title}"
+                                    TextWrapping="Wrap" />
+                                <TextBlock
+                                    Margin="0,4,0,0"
+                                    Foreground="{DynamicResource SecondaryForegroundBrush}"
+                                    Text="{x:Static props:Resources.Layout_Canvas_Description}"
+                                    TextWrapping="Wrap" />
+                            </StackPanel>
+                        </Grid>
+                    </RadioButton.Content>
+                </RadioButton>
+            </StackPanel>
         </ui:ContentDialog>
     </Grid>
 </Window>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Styles/ButtonStyles.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/Styles/ButtonStyles.xaml
index 6fe26fb955..d61638b872 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Styles/ButtonStyles.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Styles/ButtonStyles.xaml
@@ -1,7 +1,8 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:ui="http://schemas.modernwpf.com/2019">
-    
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ui="http://schemas.modernwpf.com/2019">
+
     <Style x:Key="LayoutTypeRadioButtonStyle" TargetType="RadioButton">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Background" Value="{DynamicResource RadioButtonBackground}" />
@@ -27,50 +28,50 @@
                         Background="Transparent"
                         BorderBrush="Transparent"
                         BorderThickness="2"
-                 
                         SnapsToDevicePixels="True">
+                        <Grid>
+
+                            <Border
+                                x:Name="CheckGlyph"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                BorderBrush="{DynamicResource SystemControlBackgroundAccentBrush}"
+                                BorderThickness="2"
+                                CornerRadius="4"
+                                Opacity="0"
+                                UseLayoutRounding="False" />
+
+                            <ui:ContentPresenterEx
+                                x:Name="ContentPresenter"
+                                Grid.Column="1"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Focusable="False"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                TextElement.Foreground="{TemplateBinding Foreground}"
+                                TextWrapping="Wrap" />
+                        </Grid>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CheckStates">
                                 <VisualState x:Name="Checked">
                                     <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="CheckGlyph"
-                                                         Storyboard.TargetProperty="Opacity"
-                                                         To="1"
-                                                         Duration="0" />
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="CheckGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0" />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Unchecked" />
                                 <VisualState x:Name="Indeterminate" />
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Grid>
-
-                            <Border x:Name="CheckGlyph"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch"
-                                    UseLayoutRounding="False"
-                                    Opacity="0"
-                                    CornerRadius="4"
-                                    BorderThickness="2"
-                                    BorderBrush="{DynamicResource SystemControlBackgroundAccentBrush}" />
-
-                            <ui:ContentPresenterEx x:Name="ContentPresenter"
-                                                   TextElement.Foreground="{TemplateBinding Foreground}"
-                                                   Margin="{TemplateBinding Padding}"
-                                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   Grid.Column="1"
-                                                   TextWrapping="Wrap"
-                                                   Focusable="False"
-                                                   RecognizesAccessKey="True"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="ContentPresenter"
-                                    Property="Foreground"
-                                    Value="{DynamicResource RadioButtonForegroundPointerOver}" />
+                            <Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource RadioButtonForegroundPointerOver}" />
                             <Setter TargetName="CheckGlyph" Property="Opacity" Value="0.6" />
 
                         </Trigger>
@@ -90,63 +91,48 @@
         </Setter>
     </Style>
 
-    <Style x:Key="IconOnlyButtonStyle"
-           BasedOn="{StaticResource DefaultButtonStyle}"
-           TargetType="Button">
-        <Setter Property="Background"
-                Value="Transparent" />
-        <Setter Property="Foreground"
-                Value="{DynamicResource ButtonForeground}" />
+    <Style
+        x:Key="IconOnlyButtonStyle"
+        BasedOn="{StaticResource DefaultButtonStyle}"
+        TargetType="Button">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
-                    <Border x:Name="Background"
-                            Background="Transparent"
-                            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
-                            SnapsToDevicePixels="True">
-                        <Border x:Name="Border"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Padding="{TemplateBinding Padding}"
-                                CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
-                            <ContentPresenter x:Name="ContentPresenter"
-                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              Focusable="False"
-                                              RecognizesAccessKey="True"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    <Border
+                        x:Name="Background"
+                        Background="Transparent"
+                        CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
+                        SnapsToDevicePixels="True">
+                        <Border
+                            x:Name="Border"
+                            Padding="{TemplateBinding Padding}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
+                            <ContentPresenter
+                                x:Name="ContentPresenter"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Focusable="False"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver"
-                                 Value="True">
-                            <Setter TargetName="Background"
-                                    Property="Background"
-                                    Value="{DynamicResource ButtonBackgroundPointerOver}" />
-                            <Setter TargetName="Border"
-                                    Property="BorderBrush"
-                                    Value="{DynamicResource ButtonBorderBrushPointerOver}" />
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
                         </Trigger>
-                        <Trigger Property="IsPressed"
-                                 Value="True">
-                            <Setter TargetName="Background"
-                                    Property="Background"
-                                    Value="{DynamicResource ButtonBackgroundPressed}" />
-                            <Setter TargetName="Border"
-                                    Property="BorderBrush"
-                                    Value="{DynamicResource ButtonBorderBrushPressed}" />
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
                         </Trigger>
-                        <Trigger Property="IsEnabled"
-                                 Value="False">
-                            <Setter TargetName="Background"
-                                    Property="Background"
-                                    Value="{DynamicResource ButtonBackgroundDisabled}" />
-                            <Setter TargetName="Border"
-                                    Property="BorderBrush"
-                                    Value="{DynamicResource ButtonBorderBrushDisabled}" />
-                            <Setter TargetName="ContentPresenter"
-                                    Property="TextElement.Foreground"
-                                    Value="{DynamicResource ButtonForegroundDisabled}" />
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Styles/GridViewStyles.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/Styles/GridViewStyles.xaml
index 24fb70dafa..4d98070f08 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Styles/GridViewStyles.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Styles/GridViewStyles.xaml
@@ -1,135 +1,107 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:ui="http://schemas.modernwpf.com/2019">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ui="http://schemas.modernwpf.com/2019">
 
     <Style x:Key="UWPFocusVisualStyle">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Border Margin="-2"
-                            CornerRadius="4"
-                            BorderThickness="2"
-                            BorderBrush="{DynamicResource PrimaryForegroundBrush}" />
+                    <Border
+                        Margin="-2"
+                        BorderBrush="{DynamicResource PrimaryForegroundBrush}"
+                        BorderThickness="2"
+                        CornerRadius="4" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-    
-    <DropShadowEffect x:Key="CardDropShadow"
-                      BlurRadius="6"
-                      Opacity="0.24"
-                      ShadowDepth="1" />
 
-    <Style x:Key="MonitorItemContainerStyle"
-           TargetType="ui:GridViewItem">
-        <Setter Property="Background"
-                Value="{DynamicResource LayoutItemBackgroundBrush}" />
-        <Setter Property="IsSelected"
-                Value="{Binding Selected, Mode=OneWay}" />
-        <Setter Property="AutomationProperties.Name"
-                Value="{Binding Index}" />
-        <Setter Property="KeyboardNavigation.TabNavigation"
-                Value="Local" />
-        <Setter Property="MinWidth"
-                Value="0" />
-        <Setter Property="MinHeight"
-                Value="0" />
+    <DropShadowEffect
+        x:Key="CardDropShadow"
+        BlurRadius="6"
+        Opacity="0.24"
+        ShadowDepth="1" />
+
+    <Style x:Key="MonitorItemContainerStyle" TargetType="ui:GridViewItem">
+        <Setter Property="Background" Value="{DynamicResource LayoutItemBackgroundBrush}" />
+        <Setter Property="IsSelected" Value="{Binding Selected, Mode=OneWay}" />
+        <Setter Property="AutomationProperties.Name" Value="{Binding Index}" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="MinHeight" Value="0" />
         <!--<Setter Property="IsHoldingEnabled" Value="True" />-->
-        <Setter Property="CornerRadius"
-                Value="4" />
-        <Setter Property="Margin"
-                Value="8" />
-        <Setter Property="UseSystemFocusVisuals"
-                Value="{DynamicResource UseSystemFocusVisuals}" />
-        <Setter Property="FocusVisualMargin"
-                Value="-2" />
-        <Setter Property="FocusVisualStyle"
-                Value="{DynamicResource UWPFocusVisualStyle}" />
+        <Setter Property="CornerRadius" Value="4" />
+        <Setter Property="Margin" Value="8" />
+        <Setter Property="UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
+        <Setter Property="FocusVisualMargin" Value="-2" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource UWPFocusVisualStyle}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ui:GridViewItem">
-                    <Border x:Name="ContentBorder"
-                            Height="{Binding DisplayHeight}"
-                            Width="{Binding DisplayWidth}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            Effect="{StaticResource CardDropShadow}">
+                    <Border
+                        x:Name="ContentBorder"
+                        Width="{Binding DisplayWidth}"
+                        Height="{Binding DisplayHeight}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Effect="{StaticResource CardDropShadow}"
+                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                         <VisualStateManager.CustomVisualStateManager>
                             <ui:SimpleVisualStateManager />
                         </VisualStateManager.CustomVisualStateManager>
 
                         <Grid>
-                            <ContentPresenter x:Name="ContentPresenter"
-                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              Margin="{TemplateBinding Padding}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                            <Border x:Name="BorderRectangle"
-                                    IsHitTestVisible="False"
-                                    BorderBrush="{DynamicResource SystemControlHighlightListAccentLowBrush}"
-                                    BorderThickness="2"
-                                    CornerRadius="4"
-                                    Opacity="0" />
+                            <ContentPresenter
+                                x:Name="ContentPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <Border
+                                x:Name="BorderRectangle"
+                                BorderBrush="{DynamicResource SystemControlHighlightListAccentLowBrush}"
+                                BorderThickness="2"
+                                CornerRadius="4"
+                                IsHitTestVisible="False"
+                                Opacity="0" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <!-- Focused -->
-                        <Trigger Property="ui:FocusVisualHelper.ShowFocusVisual"
-                                 Value="True">
-                            <Setter TargetName="BorderRectangle"
-                                    Property="Visibility"
-                                    Value="Collapsed" />
+                        <!--  Focused  -->
+                        <Trigger Property="ui:FocusVisualHelper.ShowFocusVisual" Value="True">
+                            <Setter TargetName="BorderRectangle" Property="Visibility" Value="Collapsed" />
                         </Trigger>
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding Selected}"
-                                           Value="True" />
+                                <Condition Binding="{Binding Selected}" Value="True" />
 
                             </MultiDataTrigger.Conditions>
-                            <Setter TargetName="ContentPresenter"
-                                    Property="TextElement.Foreground"
-                                    Value="{DynamicResource SystemControlHighlightAccentBrush}" />
-                            <Setter TargetName="BorderRectangle"
-                                    Property="Opacity"
-                                    Value="1" />
-                            <Setter TargetName="BorderRectangle"
-                                    Property="BorderBrush"
-                                    Value="{DynamicResource SystemControlHighlightAccentBrush}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource SystemControlHighlightAccentBrush}" />
+                            <Setter TargetName="BorderRectangle" Property="Opacity" Value="1" />
+                            <Setter TargetName="BorderRectangle" Property="BorderBrush" Value="{DynamicResource SystemControlHighlightAccentBrush}" />
                         </MultiDataTrigger>
 
-                        <!-- PointerOver -->
+                        <!--  PointerOver  -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver"
-                                           Value="True" />
-                                <Condition Property="IsSelected"
-                                           Value="False" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsSelected" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="BorderRectangle"
-                                    Property="Opacity"
-                                    Value="1" />
-                            <Setter TargetName="BorderRectangle"
-                                    Property="BorderBrush"
-                                    Value="{DynamicResource SystemControlHighlightListLowBrush}" />
-                            <Setter TargetName="ContentPresenter"
-                                    Property="TextElement.Foreground"
-                                    Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
-                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryBrush"
-                                    Value="{DynamicResource SystemControlHighlightListLowBrush}" />
-                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryThickness"
-                                    Value="2" />
+                            <Setter TargetName="BorderRectangle" Property="Opacity" Value="1" />
+                            <Setter TargetName="BorderRectangle" Property="BorderBrush" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryBrush" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
+                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryThickness" Value="2" />
                         </MultiTrigger>
-                        <!-- Selected -->
+                        <!--  Selected  -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver"
-                                           Value="False" />
-                                <Condition Property="IsSelected"
-                                           Value="True" />
+                                <Condition Property="IsMouseOver" Value="False" />
+                                <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
 
                             <!--<Setter TargetName="BorderRectangle"
@@ -147,143 +119,103 @@
                                         Value="2" />-->
 
                         </MultiTrigger>
-                        <!-- PointerOverSelected -->
+                        <!--  PointerOverSelected  -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver"
-                                           Value="True" />
-                                <Condition Property="IsSelected"
-                                           Value="True" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
 
-                            <Setter TargetName="BorderRectangle"
-                                    Property="Opacity"
-                                    Value="1" />
-                            <Setter TargetName="BorderRectangle"
-                                    Property="BorderBrush"
-                                    Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
-                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryBrush"
-                                    Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
-                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryThickness"
-                                    Value="2" />
+                            <Setter TargetName="BorderRectangle" Property="Opacity" Value="1" />
+                            <Setter TargetName="BorderRectangle" Property="BorderBrush" Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
+                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryBrush" Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
+                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryThickness" Value="2" />
 
                         </MultiTrigger>
-                        <!-- Disabled -->
-                        <Trigger Property="IsEnabled"
-                                 Value="False">
-                            <Setter TargetName="ContentBorder"
-                                    Property="Opacity"
-                                    Value="{DynamicResource ListViewItemDisabledThemeOpacity}" />
+                        <!--  Disabled  -->
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="ContentBorder" Property="Opacity" Value="{DynamicResource ListViewItemDisabledThemeOpacity}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-    <Style x:Key="LayoutItemContainerStyle"
-           TargetType="ui:GridViewItem">
-        <Setter Property="Background"
-                Value="{DynamicResource LayoutItemBackgroundBrush}" />
-        <Setter Property="IsSelected"
-                Value="{Binding IsApplied, Mode=OneWay}" />
-        <Setter Property="AutomationProperties.Name"
-                Value="{Binding Name}" />
-        <Setter Property="KeyboardNavigation.TabNavigation"
-                Value="Local" />
+    <Style x:Key="LayoutItemContainerStyle" TargetType="ui:GridViewItem">
+        <Setter Property="Background" Value="{DynamicResource LayoutItemBackgroundBrush}" />
+        <Setter Property="IsSelected" Value="{Binding IsApplied, Mode=OneWay}" />
+        <Setter Property="AutomationProperties.Name" Value="{Binding Name}" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
         <!--<Setter Property="IsHoldingEnabled" Value="True" />-->
-        <Setter Property="CornerRadius"
-                Value="4" />
-        <Setter Property="Margin"
-                Value="8" />
-        <Setter Property="UseSystemFocusVisuals"
-                Value="{DynamicResource UseSystemFocusVisuals}" />
-        <Setter Property="FocusVisualMargin"
-                Value="-2" />
-        <Setter Property="FocusVisualStyle"
-                Value="{DynamicResource UWPFocusVisualStyle}" />
+        <Setter Property="CornerRadius" Value="4" />
+        <Setter Property="Margin" Value="8" />
+        <Setter Property="UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
+        <Setter Property="FocusVisualMargin" Value="-2" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource UWPFocusVisualStyle}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ui:GridViewItem">
-                    <Border x:Name="ContentBorder"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            Effect="{StaticResource CardDropShadow}">
+                    <Border
+                        x:Name="ContentBorder"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Effect="{StaticResource CardDropShadow}"
+                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                         <VisualStateManager.CustomVisualStateManager>
                             <ui:SimpleVisualStateManager />
                         </VisualStateManager.CustomVisualStateManager>
 
                         <Grid>
-                            <ContentPresenter x:Name="ContentPresenter"
-                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              Margin="{TemplateBinding Padding}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                            <Border x:Name="BorderRectangle"
-                                    IsHitTestVisible="False"
-                                    BorderBrush="{DynamicResource SystemControlHighlightListAccentLowBrush}"
-                                    BorderThickness="2"
-                                    CornerRadius="4"
-                                    Opacity="0" />
+                            <ContentPresenter
+                                x:Name="ContentPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <Border
+                                x:Name="BorderRectangle"
+                                BorderBrush="{DynamicResource SystemControlHighlightListAccentLowBrush}"
+                                BorderThickness="2"
+                                CornerRadius="4"
+                                IsHitTestVisible="False"
+                                Opacity="0" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <!-- Focused -->
-                        <Trigger Property="ui:FocusVisualHelper.ShowFocusVisual"
-                                 Value="True">
-                            <Setter TargetName="BorderRectangle"
-                                    Property="Visibility"
-                                    Value="Collapsed" />
+                        <!--  Focused  -->
+                        <Trigger Property="ui:FocusVisualHelper.ShowFocusVisual" Value="True">
+                            <Setter TargetName="BorderRectangle" Property="Visibility" Value="Collapsed" />
                         </Trigger>
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding IsApplied}"
-                                           Value="True" />
+                                <Condition Binding="{Binding IsApplied}" Value="True" />
 
                             </MultiDataTrigger.Conditions>
-                            <Setter TargetName="ContentPresenter"
-                                    Property="TextElement.Foreground"
-                                    Value="{DynamicResource SystemControlHighlightAccentBrush}" />
-                            <Setter TargetName="BorderRectangle"
-                                    Property="Opacity"
-                                    Value="1" />
-                            <Setter TargetName="BorderRectangle"
-                                    Property="BorderBrush"
-                                    Value="{DynamicResource SystemControlHighlightAccentBrush}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource SystemControlHighlightAccentBrush}" />
+                            <Setter TargetName="BorderRectangle" Property="Opacity" Value="1" />
+                            <Setter TargetName="BorderRectangle" Property="BorderBrush" Value="{DynamicResource SystemControlHighlightAccentBrush}" />
                         </MultiDataTrigger>
 
-                        <!-- PointerOver -->
+                        <!--  PointerOver  -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver"
-                                           Value="True" />
-                                <Condition Property="IsSelected"
-                                           Value="False" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsSelected" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="BorderRectangle"
-                                    Property="Opacity"
-                                    Value="1" />
-                            <Setter TargetName="BorderRectangle"
-                                    Property="BorderBrush"
-                                    Value="{DynamicResource SystemControlHighlightListLowBrush}" />
-                            <Setter TargetName="ContentPresenter"
-                                    Property="TextElement.Foreground"
-                                    Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
-                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryBrush"
-                                    Value="{DynamicResource SystemControlHighlightListLowBrush}" />
-                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryThickness"
-                                    Value="2" />
+                            <Setter TargetName="BorderRectangle" Property="Opacity" Value="1" />
+                            <Setter TargetName="BorderRectangle" Property="BorderBrush" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryBrush" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
+                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryThickness" Value="2" />
                         </MultiTrigger>
-                        <!-- Selected -->
+                        <!--  Selected  -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver"
-                                           Value="False" />
-                                <Condition Property="IsSelected"
-                                           Value="True" />
+                                <Condition Property="IsMouseOver" Value="False" />
+                                <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
 
                             <!--<Setter TargetName="BorderRectangle"
@@ -301,33 +233,22 @@
                                         Value="2" />-->
 
                         </MultiTrigger>
-                        <!-- PointerOverSelected -->
+                        <!--  PointerOverSelected  -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver"
-                                           Value="True" />
-                                <Condition Property="IsSelected"
-                                           Value="True" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
 
-                            <Setter TargetName="BorderRectangle"
-                                    Property="Opacity"
-                                    Value="1" />
-                            <Setter TargetName="BorderRectangle"
-                                    Property="BorderBrush"
-                                    Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
-                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryBrush"
-                                    Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
-                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryThickness"
-                                    Value="2" />
+                            <Setter TargetName="BorderRectangle" Property="Opacity" Value="1" />
+                            <Setter TargetName="BorderRectangle" Property="BorderBrush" Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
+                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryBrush" Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
+                            <Setter Property="ui:FocusVisualHelper.FocusVisualSecondaryThickness" Value="2" />
 
                         </MultiTrigger>
-                        <!-- Disabled -->
-                        <Trigger Property="IsEnabled"
-                                 Value="False">
-                            <Setter TargetName="ContentBorder"
-                                    Property="Opacity"
-                                    Value="{DynamicResource ListViewItemDisabledThemeOpacity}" />
+                        <!--  Disabled  -->
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="ContentBorder" Property="Opacity" Value="{DynamicResource ListViewItemDisabledThemeOpacity}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Styles/LayoutPreviewStyles.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/Styles/LayoutPreviewStyles.xaml
index 0b9b0aeeea..754760212e 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Styles/LayoutPreviewStyles.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Styles/LayoutPreviewStyles.xaml
@@ -1,9 +1,14 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:ui="http://schemas.modernwpf.com/2019"
-                    xmlns:local="clr-namespace:FancyZonesEditor.Styles">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:FancyZonesEditor.Styles"
+    xmlns:ui="http://schemas.modernwpf.com/2019">
 
-    <DropShadowEffect x:Key="ZoneDropShadow" BlurRadius="16" Opacity="0.28" ShadowDepth="1" />
+    <DropShadowEffect
+        x:Key="ZoneDropShadow"
+        BlurRadius="16"
+        Opacity="0.28"
+        ShadowDepth="1" />
 
     <Style x:Key="GridLayoutSmallScalePreviewStyle" TargetType="Border">
         <Setter Property="Background" Value="{DynamicResource LayoutPreviewSmallScaleZoneBackgroundBrush}" />
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Themes/Dark.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/Themes/Dark.xaml
index 6f47b0c872..6af5043b4d 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Themes/Dark.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Themes/Dark.xaml
@@ -1,6 +1,7 @@
-<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">
 
     <!--  Metadata  -->
     <system:String x:Key="Theme.Name">Dark.Accent1</system:String>
@@ -9,7 +10,7 @@
     <system:String x:Key="Theme.BaseColorScheme">Dark</system:String>
     <system:String x:Key="Theme.ColorScheme">Accent1</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">Black</Color>
- 
+
     <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF242424" />
     <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF1c1c1c" />
     <SolidColorBrush x:Key="TertiaryBackgroundBrush" Color="#FF202020" />
@@ -17,14 +18,14 @@
     <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF9a9a9a" />
     <SolidColorBrush x:Key="BackdropBrush" Color="#40F0F0F0" />
     <SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF9a9a9a" />
-    
-    <!-- Used for layouts and monitors -->
+
+    <!--  Used for layouts and monitors  -->
     <SolidColorBrush x:Key="LayoutItemBackgroundBrush" Color="#FF3A3A3A" />
     <SolidColorBrush x:Key="LayoutItemBackgroundPointerOverBrush" Color="#FF333333" />
 
-    <!-- Used for the fullscreen preview (ActualScale) and for the thumbnail preview (SmallScale) -->
+    <!--  Used for the fullscreen preview (ActualScale) and for the thumbnail preview (SmallScale)  -->
     <SolidColorBrush x:Key="LayoutPreviewBackgroundBrush" Color="#331B1B1B" />
-    <!-- Currently unused -->
+    <!--  Currently unused  -->
     <SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#FF555454" />
 
     <SolidColorBrush x:Key="LayoutPreviewActualScaleZoneBackgroundBrush" Color="#B0202020" />
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrast1.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrast1.xaml
index 87087d1bdd..d92e62adf5 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrast1.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrast1.xaml
@@ -1,6 +1,7 @@
-<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">
 
     <!--  Metadata  -->
     <system:String x:Key="Theme.Name">HighContrast.Accent2</system:String>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrast2.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrast2.xaml
index f3ef75dfc4..15a6dc565c 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrast2.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrast2.xaml
@@ -1,6 +1,7 @@
-<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">
 
     <!--  Metadata  -->
     <system:String x:Key="Theme.Name">HighContrast.Accent3</system:String>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrastBlack.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrastBlack.xaml
index 590943262e..09e03444fa 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrastBlack.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrastBlack.xaml
@@ -1,6 +1,7 @@
-<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">
 
     <!--  Metadata  -->
     <system:String x:Key="Theme.Name">HighContrast.Accent4</system:String>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrastWhite.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrastWhite.xaml
index 2e10cf47e4..f6b3e82ef9 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrastWhite.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrastWhite.xaml
@@ -1,6 +1,7 @@
-<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">
 
     <!--  Metadata  -->
     <system:String x:Key="Theme.Name">HighContrast.Accent5</system:String>
@@ -21,7 +22,7 @@
     <SolidColorBrush x:Key="LayoutItemBackgroundPointerOverBrush" Color="#FFf2f2f2" />
     <SolidColorBrush x:Key="LayoutPreviewBackgroundBrush" Color="#19949494" />
     <SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#9c9c9c" />
-    
+
     <SolidColorBrush x:Key="LayoutPreviewActualScaleZoneBackgroundBrush" Color="#EFF3F3F3" />
     <SolidColorBrush x:Key="LayoutPreviewSmallScaleZoneBackgroundBrush" Color="#FFDCDCDC" />
     <SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#E5F3F3F3" />
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Themes/Light.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/Themes/Light.xaml
index ae95aeedda..0492b431a8 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Themes/Light.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Themes/Light.xaml
@@ -1,6 +1,7 @@
-<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">
 
     <!--  Metadata  -->
     <system:String x:Key="Theme.Name">Light.Accent1</system:String>
@@ -18,18 +19,18 @@
     <SolidColorBrush x:Key="BackdropBrush" Color="#85F0F0F0" />
     <SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF949494" />
 
-    <!-- Used for layouts and monitors -->
-    <SolidColorBrush x:Key="LayoutItemBackgroundBrush" Color="#FFffffff"/>
+    <!--  Used for layouts and monitors  -->
+    <SolidColorBrush x:Key="LayoutItemBackgroundBrush" Color="#FFffffff" />
     <SolidColorBrush x:Key="LayoutItemBackgroundPointerOverBrush" Color="#FFf2f2f2" />
 
-    <!-- Used for the fullscreen preview (ActualScale) and for the thumbnail preview (SmallScale) -->
+    <!--  Used for the fullscreen preview (ActualScale) and for the thumbnail preview (SmallScale)  -->
     <SolidColorBrush x:Key="LayoutPreviewBackgroundBrush" Color="#19949494" />
-    <!-- Currently unused -->
+    <!--  Currently unused  -->
     <SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#FFC3BEBE" />
 
     <SolidColorBrush x:Key="LayoutPreviewActualScaleZoneBackgroundBrush" Color="#C5F8F8F8" />
     <SolidColorBrush x:Key="LayoutPreviewSmallScaleZoneBackgroundBrush" Color="#FFDCDCDC" />
-    
+
     <SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#C5F8F8F8" />
     <SolidColorBrush x:Key="CanvasZoneBorderBrush" Color="#CC000000" />
     <SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#C5F8F8F8" />