From 54be57e90258670c7c577ae4ad83f5ad4cc3d132 Mon Sep 17 00:00:00 2001
From: Dirkster99 <Dirk.Bahle@gmx.de>
Date: Wed, 8 Jul 2020 22:47:58 +0200
Subject: [PATCH] Removing DictionaryTheme class and references since it
 appeared to be unused. Cleaned code with CodeMaid.

---
 .../AvalonDock.Themes.Expression/Theme.xaml   | 3162 +++++-----
 .../Controls/AnchorablePaneDropTarget.cs      |  417 +-
 .../Controls/AnchorablePaneTabPanel.cs        |    9 +-
 .../Controls/AnchorablePaneTitle.cs           |   11 +-
 .../Controls/AutoHideWindowManager.cs         |   11 +-
 .../AvalonDock/Controls/ContextMenuEx.cs      |    2 +-
 .../Controls/DockingManagerDropTarget.cs      |  303 +-
 .../DocumentPaneDropAsAnchorableTarget.cs     |  251 +-
 .../Controls/DocumentPaneDropTarget.cs        |  718 +--
 .../Controls/DocumentPaneGroupDropTarget.cs   |   85 +-
 .../Controls/DocumentPaneTabPanel.cs          |    8 +-
 .../AvalonDock/Controls/DragService.cs        |   20 +-
 .../AvalonDock/Controls/DropArea.cs           |   12 +-
 .../AvalonDock/Controls/DropDownButton.cs     |    8 +-
 .../Controls/DropDownControlArea.cs           |    8 +-
 .../AvalonDock/Controls/DropTarget.cs         |   18 +-
 .../AvalonDock/Controls/DropTargetBase.cs     |    2 +-
 .../AvalonDock/Controls/DropTargetType.cs     |   10 +-
 .../AvalonDock/Controls/Extensions.cs         |    6 +-
 .../Controls/FocusElementManager.cs           |   13 +-
 .../AvalonDock/Controls/FullWeakDictionary.cs |    8 +-
 .../AvalonDock/Controls/IDropTarget.cs        |   18 +-
 .../AvalonDock/Controls/IOverlayWindow.cs     |   22 +-
 .../AvalonDock/Controls/IOverlayWindowHost.cs |    8 +-
 .../Controls/LayoutAnchorControl.cs           |   12 +-
 .../Controls/LayoutAnchorGroupControl.cs      |   10 +-
 .../Controls/LayoutAnchorSideControl.cs       |   13 +-
 .../Controls/LayoutAnchorableControl.cs       |   14 +-
 .../LayoutAnchorableFloatingWindowControl.cs  |   25 +-
 .../Controls/LayoutAnchorableItem.cs          |  578 +-
 .../Controls/LayoutAnchorablePaneControl.cs   |   11 +-
 .../LayoutAnchorablePaneGroupControl.cs       |   11 +-
 .../Controls/LayoutAnchorableTabItem.cs       |   13 +-
 .../Controls/LayoutAutoHideWindowControl.cs   |   79 +-
 .../Controls/LayoutDocumentControl.cs         |   13 +-
 .../LayoutDocumentFloatingWindowControl.cs    |   65 +-
 .../AvalonDock/Controls/LayoutDocumentItem.cs |   10 +-
 .../Controls/LayoutDocumentPaneControl.cs     |   23 +-
 .../LayoutDocumentPaneGroupControl.cs         |   12 +-
 .../Controls/LayoutDocumentTabItem.cs         |   15 +-
 .../Controls/LayoutFloatingWindowControl.cs   | 1426 +++--
 .../AvalonDock/Controls/LayoutGridControl.cs  |   22 +-
 .../Controls/LayoutGridResizerControl.cs      |    4 +-
 .../AvalonDock/Controls/LayoutItem.cs         |   97 +-
 .../AvalonDock/Controls/LayoutPanelControl.cs |   39 +-
 .../AvalonDock/Controls/MenuItemEx.cs         |   22 +-
 .../AvalonDock/Controls/NamespaceDoc.cs       |    2 +-
 .../AvalonDock/Controls/NavigatorWindow.cs    |   68 +-
 .../AvalonDock/Controls/OverlayWindow.cs      |  193 +-
 .../AvalonDock/Controls/ReentrantFlag.cs      |   11 +-
 .../AvalonDock/Controls/Shell/NamespaceDoc.cs |    2 +-
 .../Controls/Shell/Standard/ComGuids.cs       |   32 +-
 .../Controls/Shell/Standard/Debug.cs          |    2 +-
 .../Controls/Shell/Standard/DoubleUtil.cs     |   21 +-
 .../Controls/Shell/Standard/DpiHelper.cs      |    2 +-
 .../Controls/Shell/Standard/ErrorCodes.cs     |   52 +-
 .../Controls/Shell/Standard/MessageWindow.cs  |   11 +-
 .../Controls/Shell/Standard/NamespaceDoc.cs   |    2 +-
 .../Controls/Shell/Standard/NativeMethods.cs  |  197 +-
 .../Controls/Shell/Standard/ShellProvider.cs  |  159 +-
 .../Controls/Shell/Standard/StreamHelper.cs   |   40 +-
 .../Controls/Shell/Standard/Utilities.cs      |   10 +-
 .../Controls/Shell/Standard/Verify.cs         |    2 +-
 .../Controls/Shell/SystemCommands.cs          |    4 +-
 .../Controls/Shell/SystemParameters2.cs       |   32 +-
 .../AvalonDock/Controls/Shell/WindowChrome.cs |    6 +-
 .../Controls/Shell/WindowChromeWorker.cs      |   34 +-
 .../AvalonDock/Controls/TabControlEx.cs       |   13 +-
 .../Controls/TransformExtentions.cs           |    3 +-
 .../AvalonDock/Controls/WeakDictionary.cs     |    4 +-
 .../Controls/WindowActivateEventArgs.cs       |    2 +-
 .../AvalonDock/Controls/WindowHookHandler.cs  |    6 +-
 ...mmandLayoutItemFromLayoutModelConverter.cs |  100 +-
 .../Converters/AnchorSideToAngleConverter.cs  |   92 +-
 .../AnchorSideToOrientationConverter.cs       |   16 +-
 ...rableContextMenuHideVisibilityConverter.cs |  116 +-
 ...mmandLayoutItemFromLayoutModelConverter.cs |  104 +-
 .../Converters/BoolToVisibilityConverter.cs   |  119 +-
 .../AvalonDock/Converters/ConverterCreater.cs |   56 +-
 ...mmandLayoutItemFromLayoutModelConverter.cs |  104 +-
 .../InverseBoolToVisibilityConverter.cs       |   86 +-
 .../LayoutItemFromLayoutModelConverter.cs     |  100 +-
 .../AvalonDock/Converters/NamespaceDoc.cs     |    2 +-
 .../Converters/NullToDoNothingConverter.cs    |   74 +-
 .../OverlayWindowToVisibilityConverter.cs     |   84 +-
 .../UriSourceToBitmapImageConverter.cs        |   90 +-
 .../Components/AvalonDock/DockingManager.cs   | 5138 ++++++++---------
 .../AvalonDock/DocumentClosedEventArgs.cs     |    4 +-
 .../AvalonDock/DocumentClosingEventArgs.cs    |    4 +-
 source/Components/AvalonDock/Extensions.cs    |  210 +-
 .../AvalonDock/Layout/AnchorSide.cs           |    2 +-
 .../Layout/AnchorableShowStrategy.cs          |    2 +-
 .../Layout/ChildrenTreeChangedEventArgs.cs    |    2 +-
 .../AvalonDock/Layout/Extensions.cs           |    4 +-
 .../Layout/IAdjustableSizeLayout.cs           |    2 +-
 .../Layout/ILayoutAnchorablePane.cs           |    2 +-
 .../AvalonDock/Layout/ILayoutContainer.cs     |    2 +-
 .../Layout/ILayoutContentSelector.cs          |    4 +-
 .../AvalonDock/Layout/ILayoutControl.cs       |    2 +-
 .../AvalonDock/Layout/ILayoutDocumentPane.cs  |    2 +-
 .../AvalonDock/Layout/ILayoutElement.cs       |    2 +-
 ...LayoutElementForFloatingWindowExtension.cs |    8 +-
 .../Layout/ILayoutElementWithVisibility.cs    |    2 +-
 .../AvalonDock/Layout/ILayoutGroup.cs         |    2 +-
 .../Layout/ILayoutOrientableGroup.cs          |    2 +-
 .../AvalonDock/Layout/ILayoutPane.cs          |    2 +-
 .../Layout/ILayoutPaneSerializable.cs         |    4 +-
 .../AvalonDock/Layout/ILayoutPanelElement.cs  |    2 +-
 .../Layout/ILayoutPositionableElement.cs      |    3 +-
 .../Layout/ILayoutPreviousContainer.cs        |    4 +-
 .../AvalonDock/Layout/ILayoutRoot.cs          |    2 +-
 .../Layout/ILayoutUpdateStrategy.cs           |    2 +-
 .../AvalonDock/Layout/LayoutAnchorGroup.cs    |   14 +-
 .../AvalonDock/Layout/LayoutAnchorSide.cs     |   12 +-
 .../AvalonDock/Layout/LayoutAnchorable.cs     |   39 +-
 .../Layout/LayoutAnchorableFloatingWindow.cs  |    6 +-
 .../AvalonDock/Layout/LayoutAnchorablePane.cs |    9 +-
 .../Layout/LayoutAnchorablePaneGroup.cs       |   15 +-
 .../AvalonDock/Layout/LayoutContent.cs        |   33 +-
 .../AvalonDock/Layout/LayoutDocument.cs       |    6 +-
 .../Layout/LayoutDocumentFloatingWindow.cs    |   14 +-
 .../AvalonDock/Layout/LayoutDocumentPane.cs   |   23 +-
 .../Layout/LayoutDocumentPaneGroup.cs         |    6 +-
 .../AvalonDock/Layout/LayoutElement.cs        |   18 +-
 .../Layout/LayoutElementEventArgs.cs          |    2 +-
 .../AvalonDock/Layout/LayoutFloatingWindow.cs |   11 +-
 .../AvalonDock/Layout/LayoutGroup.cs          |   11 +-
 .../AvalonDock/Layout/LayoutGroupBase.cs      |    3 +-
 .../AvalonDock/Layout/LayoutPanel.cs          |   18 +-
 .../Layout/LayoutPositionableGroup.cs         |   19 +-
 .../AvalonDock/Layout/LayoutRoot.cs           |   71 +-
 .../AvalonDock/Layout/NamespaceDoc.cs         |    2 +-
 .../LayoutSerializationCallbackEventArgs.cs   |    8 +-
 .../Layout/Serialization/LayoutSerializer.cs  |   12 +-
 .../Layout/Serialization/NamespaceDoc.cs      |    2 +-
 .../Serialization/XmlLayoutSerializer.cs      |    8 +-
 source/Components/AvalonDock/MathHelper.cs    |    4 +-
 .../AvalonDock/Themes/DictionaryTheme.cs      |   53 -
 source/Components/AvalonDock/Win32Helper.cs   |   83 +-
 source/Components/AvalonDock/WindowHelper.cs  |   19 +-
 140 files changed, 8081 insertions(+), 7552 deletions(-)
 delete mode 100644 source/Components/AvalonDock/Themes/DictionaryTheme.cs

diff --git a/source/Components/AvalonDock.Themes.Expression/Theme.xaml b/source/Components/AvalonDock.Themes.Expression/Theme.xaml
index 35d9ea8d..5efe05e9 100644
--- a/source/Components/AvalonDock.Themes.Expression/Theme.xaml
+++ b/source/Components/AvalonDock.Themes.Expression/Theme.xaml
@@ -1,1603 +1,1603 @@
 <!--
-    ************************************************************************
-    AvalonDock
-    
-    Copyright (C) 2007-2013 Xceed Software Inc.
-    
-    This program is provided to you under the terms of the Microsoft Public
-    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
-    ************************************************************************
+	************************************************************************
+	AvalonDock
+	
+	Copyright (C) 2007-2013 Xceed Software Inc.
+	
+	This program is provided to you under the terms of the Microsoft Public
+	License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
+	************************************************************************
 -->
 
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:avalonDock="clr-namespace:AvalonDock;assembly=AvalonDock"
-    xmlns:avalonDockControls="clr-namespace:AvalonDock.Controls;assembly=AvalonDock"
-    xmlns:avalonDockConverters="clr-namespace:AvalonDock.Converters;assembly=AvalonDock"
-    xmlns:avalonDockLayout="clr-namespace:AvalonDock.Layout;assembly=AvalonDock"
-    xmlns:avalonDockProperties="clr-namespace:AvalonDock.Properties;assembly=AvalonDock"
-    xmlns:localControls="clr-namespace:AvalonDock.Themes.Controls"
-    xmlns:localThemes="clr-namespace:AvalonDock.Themes"
-    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=AvalonDock"
-    xmlns:sys="clr-namespace:System.Windows;assembly=PresentationCore">
-
-    <Style x:Key="AvalonDock_Expression_ToolButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Border
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
-                        <ContentPresenter />
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-
-    </Style>
-
-    <Style x:Key="AvalonDock_Expression_ButtonStyle" TargetType="Button">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Border
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
-                        <ContentPresenter />
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--  DocumentPaneControlStyle  -->
-    <Style x:Key="AvalonDock_Expression_DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor8}" />
-        <Setter Property="BorderBrush" Value="{x:Null}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-                    <Grid
-                        ClipToBounds="true"
-                        KeyboardNavigation.TabNavigation="Local"
-                        SnapsToDevicePixels="true">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <!--  Following border is required to catch mouse events  -->
-                        <Border Grid.RowSpan="2" Background="Transparent" />
-                        <Grid Panel.ZIndex="1">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <avalonDockControls:DocumentPaneTabPanel
-                                x:Name="HeaderPanel"
-                                Grid.Row="0"
-                                Grid.Column="0"
-                                Margin="2,0,2,0"
-                                IsItemsHost="true"
-                                KeyboardNavigation.TabIndex="1" />
-                            <avalonDockControls:DropDownButton
-                                x:Name="MenuDropDownButton"
-                                Grid.Column="1"
-                                VerticalAlignment="Center"
-                                Focusable="False"
-                                Style="{StaticResource AvalonDock_Expression_ToolButtonStyle}">
-                                <avalonDockControls:DropDownButton.DropDownContextMenu>
-                                    <avalonDockControls:ContextMenuEx ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
-                                        <avalonDockControls:ContextMenuEx.ItemContainerStyle>
-                                            <Style BasedOn="{StaticResource {x:Type MenuItem}}" TargetType="{x:Type avalonDockControls:MenuItemEx}">
-                                                <Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}" />
-                                                <Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}" />
-                                                <Setter Property="IconTemplate" Value="{Binding Path=Root.Manager.IconContentTemplate}" />
-                                                <Setter Property="IconTemplateSelector" Value="{Binding Path=Root.Manager.IconContentTemplateSelector}" />
-                                                <Setter Property="Command" Value="{Binding Path=., Converter={avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter}}" />
-                                            </Style>
-                                        </avalonDockControls:ContextMenuEx.ItemContainerStyle>
-                                    </avalonDockControls:ContextMenuEx>
-                                </avalonDockControls:DropDownButton.DropDownContextMenu>
-                                <Image Source="/AvalonDock.Themes.Expression;component/Images/PinMenu.png" />
-                            </avalonDockControls:DropDownButton>
-                        </Grid>
-                        <Border
-                            x:Name="ContentPanel"
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Padding="0,1,0,2"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="3"
-                            KeyboardNavigation.DirectionalNavigation="Contained"
-                            KeyboardNavigation.TabIndex="2"
-                            KeyboardNavigation.TabNavigation="Cycle">
-                            <ContentPresenter
-                                x:Name="PART_SelectedContentHost"
-                                Margin="0,2,0,2"
-                                ContentSource="SelectedContent"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger SourceName="MenuDropDownButton" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="MenuDropDownButton" Property="Content">
-                                <Setter.Value>
-                                    <Image Source="/AvalonDock.Themes.Expression;component/Images/PinMenu_Light.png" />
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger SourceName="MenuDropDownButton" Property="IsChecked" Value="True">
-                            <Setter TargetName="MenuDropDownButton" Property="Content">
-                                <Setter.Value>
-                                    <Image Source="/AvalonDock.Themes.Expression;component/Images/PinMenu_Light.png" />
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ItemContainerStyle">
-            <Setter.Value>
-                <Style TargetType="{x:Type TabItem}">
-                    <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor4}" />
-                    <Setter Property="Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor2}" />
-                    <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-                    <Setter Property="ToolTip" Value="{Binding ToolTip}" />
-                    <Setter Property="Padding" Value="2,0,2,0" />
-                    <Setter Property="Margin" Value="2,0,2,0" />
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="{x:Type TabItem}">
-                                <Grid SnapsToDevicePixels="true">
-                                    <Border
-                                        x:Name="Bd"
-                                        Padding="{TemplateBinding Padding}"
-                                        Background="{TemplateBinding Background}"
-                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                        CornerRadius="2,2,0,0">
-                                        <ContentPresenter
-                                            x:Name="Content"
-                                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                                            ContentSource="Header"
-                                            RecognizesAccessKey="True"
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                                    </Border>
-                                </Grid>
-                                <ControlTemplate.Triggers>
-                                    <Trigger Property="Selector.IsSelected" Value="true">
-                                        <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor10}" />
-                                        <Setter Property="Margin" Value="-1,0,-1,-4" />
-                                        <Setter TargetName="Content" Property="Margin" Value="0,0,0,3" />
-                                    </Trigger>
-                                    <Trigger Property="IsEnabled" Value="false">
-                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_Expression_BaseColor13}" />
-                                        <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor9}" />
-                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                                    </Trigger>
-                                </ControlTemplate.Triggers>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ItemTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutDocumentTabItem Model="{Binding}" />
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Setter Property="ContentTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutDocumentControl Model="{Binding}" />
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--  AnchorablePaneControlStyle  -->
-    <Style x:Key="AvalonDock_Expression_AnchorablePaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
-        <Setter Property="TabStripPlacement" Value="Bottom" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Foreground" Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}" />
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor8}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
-                    <Grid
-                        ClipToBounds="true"
-                        KeyboardNavigation.TabNavigation="Local"
-                        SnapsToDevicePixels="true">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <!--  Following border is required to catch mouse events  -->
-                        <Border Grid.RowSpan="2" Background="Transparent" />
-
-                        <Border x:Name="Header">
-                            <avalonDockControls:AnchorablePaneTitle Model="{Binding Model.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}" />
-                        </Border>
-
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="48" />
-                            </Grid.ColumnDefinitions>
-                            <avalonDockControls:AnchorablePaneTabPanel
-                                x:Name="HeaderPanel"
-                                Margin="0,2,0,0"
-                                Panel.ZIndex="1"
-                                IsItemsHost="true"
-                                KeyboardNavigation.TabIndex="1" />
-                        </Grid>
-
-                        <Border
-                            x:Name="ContentPanel"
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Padding="1"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            KeyboardNavigation.DirectionalNavigation="Contained"
-                            KeyboardNavigation.TabIndex="2"
-                            KeyboardNavigation.TabNavigation="Cycle">
-                            <ContentPresenter
-                                x:Name="PART_SelectedContentHost"
-                                Margin="{TemplateBinding Padding}"
-                                ContentSource="SelectedContent"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <MultiDataTrigger>
-                            <!--
-                                Hide the title if the control is directly hosted in floating window
-                                The floating window control will show the title if there is only one control to host
-                                without any other LayoutAnchorableControl
-                            -->
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.IsFloating}" Value="True" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.Parent.IsDirectlyHostedInFloatingWindow}" Value="True" />
-                            </MultiDataTrigger.Conditions>
-                            <Setter TargetName="Header" Property="Visibility" Value="Collapsed" />
-                        </MultiDataTrigger>
-                        <MultiDataTrigger>
-                            <!--
-                                Also hide the title, if model cannot be bound which can happen when using virtualization
-                                See Issue #148 Drop Down Menu for LayoutAnchorables is not correct with Virtualization
-                            -->
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model}" Value="{x:Null}" />
-                            </MultiDataTrigger.Conditions>
-                            <Setter TargetName="Header" Property="Visibility" Value="Collapsed" />
-                        </MultiDataTrigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Setter Property="ItemContainerStyle">
-            <Setter.Value>
-                <Style TargetType="{x:Type TabItem}">
-                    <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor4}" />
-                    <Setter Property="Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor2}" />
-                    <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-                    <Setter Property="ToolTip" Value="{Binding ToolTip}" />
-                    <Setter Property="Margin" Value="0,0,-10,0" />
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="{x:Type TabItem}">
-                                <Grid SnapsToDevicePixels="true">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="22" />
-                                    </Grid.ColumnDefinitions>
-                                    <Border
-                                        x:Name="Bd"
-                                        Padding="{TemplateBinding Padding}"
-                                        Background="{TemplateBinding Background}"
-                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                        CornerRadius="3,0,0,0">
-                                        <ContentPresenter
-                                            x:Name="Content"
-                                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                                            ContentSource="Header"
-                                            RecognizesAccessKey="True"
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                                    </Border>
-
-                                    <localControls:SplineBorder
-                                        Grid.Column="1"
-                                        Fill="{TemplateBinding Background}"
-                                        Stroke="{TemplateBinding Background}" />
-                                </Grid>
-                                <ControlTemplate.Triggers>
-                                    <Trigger Property="Selector.IsSelected" Value="true">
-                                        <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor10}" />
-                                        <Setter Property="Panel.ZIndex" Value="1" />
-                                    </Trigger>
-                                    <Trigger Property="IsEnabled" Value="false">
-                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                                    </Trigger>
-                                    <DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ItemsControl}}" Value="1">
-                                        <Setter Property="IsHitTestVisible" Value="False" />
-                                    </DataTrigger>
-                                </ControlTemplate.Triggers>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </Setter.Value>
-        </Setter>
-
-        <Setter Property="ItemTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutAnchorableTabItem Model="{Binding}" />
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-
-        <Setter Property="ContentTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="avalonDockControls:AnchorablePaneTitle">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Border
-                        Padding="0,4,0,4"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="2,2,0,0">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-
-                            <avalonDockControls:DropDownButton
-                                x:Name="MenuDropDownButton"
-                                Grid.Column="1"
-                                VerticalAlignment="Center"
-                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                Focusable="False"
-                                Style="{StaticResource AvalonDock_Expression_ToolButtonStyle}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
-                                <Image x:Name="PART_ImgMenuPin" Source="/AvalonDock.Themes.Expression;component/Images/PinMenu.png" />
-                            </avalonDockControls:DropDownButton>
-
-                            <Button
-                                x:Name="PART_AutoHidePin"
-                                Grid.Column="2"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                Focusable="False"
-                                Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"
-                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}, ConverterParameter=Visibility.Hidden}">
-                                <Image x:Name="PART_ImgAutoHidePin" Source="/AvalonDock.Themes.Expression;component/Images/PinAutoHide.png" />
-                            </Button>
-
-                            <Button
-                                x:Name="PART_HidePin"
-                                Grid.Column="3"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                Focusable="False"
-                                Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
-                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
-                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-                                <Image x:Name="PART_ImgHidePin" Source="/AvalonDock.Themes.Expression;component/Images/PinClose.png" />
-                            </Button>
-
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor5}" />
-                        </Trigger>
-                        <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-                            <Setter TargetName="PART_AutoHidePin" Property="LayoutTransform">
-                                <Setter.Value>
-                                    <RotateTransform Angle="90" />
-                                </Setter.Value>
-                            </Setter>
-                        </DataTrigger>
-                        <Trigger SourceName="MenuDropDownButton" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ImgMenuPin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinMenu_Light.png" />
-                        </Trigger>
-                        <Trigger SourceName="MenuDropDownButton" Property="IsChecked" Value="True">
-                            <Setter TargetName="PART_ImgMenuPin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinMenu_Light.png" />
-                        </Trigger>
-                        <Trigger SourceName="PART_AutoHidePin" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ImgAutoHidePin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinAutoHide_Light.png" />
-                        </Trigger>
-                        <Trigger SourceName="PART_HidePin" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ImgHidePin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinClose_Light.png" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <ControlTemplate x:Key="AvalonDock_Expression_AnchorSideTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
-        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel
-                        MinWidth="4"
-                        MinHeight="4"
-                        Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={avalonDockConverters:AnchorSideToOrientationConverter}}" />
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-    </ControlTemplate>
-
-    <ControlTemplate x:Key="AvalonDock_Expression_AnchorGroupTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
-        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
-            <ItemsControl.LayoutTransform>
-                <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={avalonDockConverters:AnchorSideToAngleConverter}}" />
-            </ItemsControl.LayoutTransform>
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel Orientation="Horizontal" />
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-    </ControlTemplate>
-
-    <ControlTemplate x:Key="AvalonDock_Expression_AnchorTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
-        <Border
-            x:Name="Bd"
-            Margin="0,4,2,0"
-            Padding="2"
-            Background="{DynamicResource AvalonDock_Expression_BaseColor4}"
-            CornerRadius="3,3,0,0">
-            <ContentPresenter
-                Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                TextElement.Foreground="{DynamicResource AvalonDock_Expression_BaseColor2}" />
-        </Border>
-        <ControlTemplate.Triggers>
-            <Trigger Property="Side" Value="Right">
-                <Setter TargetName="Bd" Property="CornerRadius" Value="0,0,3,3" />
-                <Setter TargetName="Bd" Property="Margin" Value="0,0,2,4" />
-            </Trigger>
-            <Trigger Property="Side" Value="Bottom">
-                <Setter TargetName="Bd" Property="CornerRadius" Value="3,3,0,0" />
-                <Setter TargetName="Bd" Property="Margin" Value="2,4,0,0" />
-            </Trigger>
-            <Trigger Property="Side" Value="Top">
-                <Setter TargetName="Bd" Property="CornerRadius" Value="0,0,3,3" />
-                <Setter TargetName="Bd" Property="Margin" Value="0,0,2,4" />
-            </Trigger>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsMouseOver" Value="true" />
-                    <Condition Property="Selector.IsSelected" Value="false" />
-                </MultiTrigger.Conditions>
-                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor10}" />
-            </MultiTrigger>
-        </ControlTemplate.Triggers>
-    </ControlTemplate>
-
-    <Style x:Key="{x:Type avalonDockControls:OverlayWindow}" TargetType="{x:Type avalonDockControls:OverlayWindow}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
-                    <Canvas x:Name="PART_DropTargetsContainer" Opacity="0.9">
-                        <Path
-                            x:Name="PART_PreviewBox"
-                            Fill="AliceBlue"
-                            Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"
-                            StrokeThickness="2" />
-                        <Grid x:Name="PART_DockingManagerDropTargets">
-                            <Border
-                                x:Name="PART_DockingManagerDropTargetLeft"
-                                Width="10"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Stretch" />
-                            <Border
-                                x:Name="PART_DockingManagerDropTargetRight"
-                                Width="10"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Stretch" />
-                            <Border
-                                x:Name="PART_DockingManagerDropTargetBottom"
-                                Height="10"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Bottom" />
-                            <Border
-                                x:Name="PART_DockingManagerDropTargetTop"
-                                Height="10"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Top" />
-                        </Grid>
-                        <Grid x:Name="PART_AnchorablePaneDropTargets">
-                            <Border
-                                x:Name="PART_AnchorablePaneDropTargetLeft"
-                                Width="10"
-                                Margin="10,0,0,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Stretch" />
-                            <Border
-                                x:Name="PART_AnchorablePaneDropTargetRight"
-                                Width="10"
-                                Margin="0,0,10,0"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Stretch" />
-                            <Border
-                                x:Name="PART_AnchorablePaneDropTargetBottom"
-                                Height="10"
-                                Margin="0,10,0,0"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Bottom" />
-                            <Border
-                                x:Name="PART_AnchorablePaneDropTargetTop"
-                                Height="10"
-                                Margin="0,0,0,10"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Top" />
-                            <Border
-                                x:Name="PART_AnchorablePaneDropTargetInto"
-                                Width="0"
-                                Height="0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center" />
-                        </Grid>
-                        <Grid x:Name="PART_DocumentPaneDropTargets">
-                            <Border
-                                x:Name="PART_DocumentPaneDropTargetLeft"
-                                Width="10"
-                                Margin="10,0,0,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Stretch" />
-                            <Border
-                                x:Name="PART_DocumentPaneDropTargetRight"
-                                Width="10"
-                                Margin="0,0,10,0"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Stretch" />
-                            <Border
-                                x:Name="PART_DocumentPaneDropTargetBottom"
-                                Height="10"
-                                Margin="0,10,0,0"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Bottom" />
-                            <Border
-                                x:Name="PART_DocumentPaneDropTargetTop"
-                                Height="10"
-                                Margin="0,0,0,10"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Top" />
-                            <Border
-                                x:Name="PART_DocumentPaneDropTargetInto"
-                                Width="0"
-                                Height="0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center" />
-                        </Grid>
-
-                        <Grid x:Name="PART_DocumentPaneFullDropTargets">
-                            <Border
-                                x:Name="PART_DocumentPaneFullDropTargetLeft"
-                                Width="10"
-                                Margin="15,0,0,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Stretch" />
-                            <Border
-                                x:Name="PART_DocumentPaneFullDropTargetRight"
-                                Width="10"
-                                Margin="0,0,15,0"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Stretch" />
-                            <Border
-                                x:Name="PART_DocumentPaneFullDropTargetBottom"
-                                Height="10"
-                                Margin="0,15,0,0"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Bottom" />
-                            <Border
-                                x:Name="PART_DocumentPaneFullDropTargetTop"
-                                Height="10"
-                                Margin="0,0,0,15"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Top" />
-                            <Border
-                                x:Name="PART_DocumentPaneFullDropTargetInto"
-                                Width="0"
-                                Height="0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center" />
-
-                            <Border
-                                x:Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane"
-                                Width="15"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Stretch" />
-                            <Border
-                                x:Name="PART_DocumentPaneDropTargetRightAsAnchorablePane"
-                                Width="15"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Stretch" />
-                            <Border
-                                x:Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane"
-                                Height="15"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Bottom" />
-                            <Border
-                                x:Name="PART_DocumentPaneDropTargetTopAsAnchorablePane"
-                                Height="15"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Top" />
-
-                        </Grid>
-
-                    </Canvas>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <DataTemplate x:Key="AvalonDock_Expression_DocumentHeaderTemplate">
-        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
-    </DataTemplate>
-
-    <DataTemplate x:Key="AvalonDock_Expression_AnchorableHeaderTemplate">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <Image
-                x:Name="icon"
-                Source="{Binding IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}"
-                Stretch="Uniform" />
-            <TextBlock
-                x:Name="title"
-                Grid.Column="1"
-                Margin="4,0,0,0"
-                Text="{Binding Title}"
-                TextTrimming="CharacterEllipsis" />
-        </Grid>
-        <DataTemplate.Triggers>
-            <DataTrigger Binding="{Binding IconSource}" Value="{x:Null}">
-                <Setter TargetName="title" Property="Margin" Value="0" />
-            </DataTrigger>
-        </DataTemplate.Triggers>
-    </DataTemplate>
-
-    <DataTemplate x:Key="AvalonDock_Expression_DocumentTitleTemplate">
-        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
-    </DataTemplate>
-
-    <DataTemplate x:Key="AvalonDock_Expression_AnchorableTitleTemplate">
-        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
-    </DataTemplate>
-
-    <DataTemplate x:Key="AvalonDock_Expression_IconContentTemplate">
-        <Image Source="{Binding IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}" Stretch="Uniform" />
-    </DataTemplate>
-
-    <ContextMenu x:Key="AvalonDock_Expression_AnchorableContextMenu">
-        <MenuItem Command="{Binding Path=FloatCommand}" Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}" />
-        <MenuItem Command="{Binding Path=DockCommand}" Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}" />
-        <MenuItem Command="{Binding Path=DockAsDocumentCommand}" Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}" />
-        <MenuItem Command="{Binding Path=AutoHideCommand}" Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}" />
-        <MenuItem
-            Command="{Binding Path=CloseCommand}"
-            Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}"
-            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}" />
-    </ContextMenu>
-
-    <ContextMenu x:Key="AvalonDock_Expression_DocumentContextMenu">
-        <MenuItem
-            Command="{Binding Path=CloseCommand}"
-            Header="{x:Static avalonDockProperties:Resources.Document_Close}"
-            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}" />
-        <MenuItem Command="{Binding Path=CloseAllButThisCommand}" Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" />
-        <MenuItem Command="{Binding Path=FloatCommand}" Header="{x:Static avalonDockProperties:Resources.Document_Float}" />
-        <MenuItem Command="{Binding Path=DockAsDocumentCommand}" Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" />
-        <MenuItem
-            Command="{Binding Path=NewHorizontalTabGroupCommand}"
-            Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}"
-            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-            <MenuItem.Icon>
-                <Image
-                    Width="14"
-                    Source="/AvalonDock.Themes.Expression;component/Images/HTabGroup.png"
-                    Stretch="Uniform" />
-            </MenuItem.Icon>
-        </MenuItem>
-
-        <MenuItem
-            Command="{Binding Path=NewVerticalTabGroupCommand}"
-            Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}"
-            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-            <MenuItem.Icon>
-                <Image
-                    Width="14"
-                    Source="/AvalonDock.Themes.Expression;component/Images/VTabGroup.png"
-                    Stretch="Uniform" />
-            </MenuItem.Icon>
-        </MenuItem>
-        <MenuItem
-            Command="{Binding Path=MoveToNextTabGroupCommand}"
-            Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}"
-            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}" />
-        <MenuItem
-            Command="{Binding Path=MoveToPreviousTabGroupCommand}"
-            Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}"
-            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}" />
-    </ContextMenu>
-
-    <!--  DockingManager  -->
-    <Style x:Key="{x:Type avalonDock:DockingManager}" TargetType="{x:Type avalonDock:DockingManager}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor1}" />
-        <Setter Property="DocumentPaneControlStyle" Value="{StaticResource AvalonDock_Expression_DocumentPaneControlStyle}" />
-        <Setter Property="AnchorablePaneControlStyle" Value="{StaticResource AvalonDock_Expression_AnchorablePaneControlStyle}" />
-        <Setter Property="AnchorSideTemplate" Value="{StaticResource AvalonDock_Expression_AnchorSideTemplate}" />
-        <Setter Property="AnchorGroupTemplate" Value="{StaticResource AvalonDock_Expression_AnchorGroupTemplate}" />
-        <Setter Property="AnchorTemplate" Value="{StaticResource AvalonDock_Expression_AnchorTemplate}" />
-        <Setter Property="DocumentHeaderTemplate" Value="{StaticResource AvalonDock_Expression_DocumentHeaderTemplate}" />
-        <Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AvalonDock_Expression_AnchorableHeaderTemplate}" />
-        <Setter Property="DocumentTitleTemplate" Value="{StaticResource AvalonDock_Expression_DocumentTitleTemplate}" />
-        <Setter Property="AnchorableTitleTemplate" Value="{StaticResource AvalonDock_Expression_AnchorableTitleTemplate}" />
-        <Setter Property="AnchorableContextMenu" Value="{StaticResource AvalonDock_Expression_AnchorableContextMenu}" />
-        <Setter Property="DocumentContextMenu" Value="{StaticResource AvalonDock_Expression_DocumentContextMenu}" />
-        <Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource AvalonDock_Expression_DocumentHeaderTemplate}" />
-        <Setter Property="IconContentTemplate" Value="{StaticResource AvalonDock_Expression_IconContentTemplate}" />
-        <Setter Property="GridSplitterWidth" Value="4" />
-        <Setter Property="GridSplitterHeight" Value="4" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
-                    <Border
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <ContentPresenter
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Content="{TemplateBinding LayoutRootPanel}" />
-                            <ContentPresenter
-                                Grid.Row="1"
-                                Grid.Column="2"
-                                Content="{TemplateBinding RightSidePanel}" />
-                            <ContentPresenter
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                Content="{TemplateBinding LeftSidePanel}" />
-                            <ContentPresenter
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Content="{TemplateBinding TopSidePanel}" />
-                            <ContentPresenter
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                Content="{TemplateBinding BottomSidePanel}" />
-                            <ContentPresenter
-                                x:Name="PART_AutoHideArea"
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                                Content="{TemplateBinding AutoHideWindow}" />
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--  LayoutGridResizerControl  -->
-    <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}" TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
-                    <Border Background="{TemplateBinding Background}" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
-                    <Border
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
-                        <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}" />
-                        <!--<ContentPresenter Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:avalonDock="clr-namespace:AvalonDock;assembly=AvalonDock"
+	xmlns:avalonDockControls="clr-namespace:AvalonDock.Controls;assembly=AvalonDock"
+	xmlns:avalonDockConverters="clr-namespace:AvalonDock.Converters;assembly=AvalonDock"
+	xmlns:avalonDockLayout="clr-namespace:AvalonDock.Layout;assembly=AvalonDock"
+	xmlns:avalonDockProperties="clr-namespace:AvalonDock.Properties;assembly=AvalonDock"
+	xmlns:localControls="clr-namespace:AvalonDock.Themes.Controls"
+	xmlns:localThemes="clr-namespace:AvalonDock.Themes"
+	xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=AvalonDock"
+	xmlns:sys="clr-namespace:System.Windows;assembly=PresentationCore">
+
+	<Style x:Key="AvalonDock_Expression_ToolButtonStyle" TargetType="ToggleButton">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border
+						Background="{TemplateBinding Background}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}">
+						<ContentPresenter />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+
+
+	</Style>
+
+	<Style x:Key="AvalonDock_Expression_ButtonStyle" TargetType="Button">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Button">
+					<Border
+						Background="{TemplateBinding Background}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}">
+						<ContentPresenter />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<!--  DocumentPaneControlStyle  -->
+	<Style x:Key="AvalonDock_Expression_DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+		<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor8}" />
+		<Setter Property="BorderBrush" Value="{x:Null}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+					<Grid
+						ClipToBounds="true"
+						KeyboardNavigation.TabNavigation="Local"
+						SnapsToDevicePixels="true">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="*" />
+						</Grid.RowDefinitions>
+						<!--  Following border is required to catch mouse events  -->
+						<Border Grid.RowSpan="2" Background="Transparent" />
+						<Grid Panel.ZIndex="1">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+							<avalonDockControls:DocumentPaneTabPanel
+								x:Name="HeaderPanel"
+								Grid.Row="0"
+								Grid.Column="0"
+								Margin="2,0,2,0"
+								IsItemsHost="true"
+								KeyboardNavigation.TabIndex="1" />
+							<avalonDockControls:DropDownButton
+								x:Name="MenuDropDownButton"
+								Grid.Column="1"
+								VerticalAlignment="Center"
+								Focusable="False"
+								Style="{StaticResource AvalonDock_Expression_ToolButtonStyle}">
+								<avalonDockControls:DropDownButton.DropDownContextMenu>
+									<avalonDockControls:ContextMenuEx ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
+										<avalonDockControls:ContextMenuEx.ItemContainerStyle>
+											<Style BasedOn="{StaticResource {x:Type MenuItem}}" TargetType="{x:Type avalonDockControls:MenuItemEx}">
+												<Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}" />
+												<Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}" />
+												<Setter Property="IconTemplate" Value="{Binding Path=Root.Manager.IconContentTemplate}" />
+												<Setter Property="IconTemplateSelector" Value="{Binding Path=Root.Manager.IconContentTemplateSelector}" />
+												<Setter Property="Command" Value="{Binding Path=., Converter={avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter}}" />
+											</Style>
+										</avalonDockControls:ContextMenuEx.ItemContainerStyle>
+									</avalonDockControls:ContextMenuEx>
+								</avalonDockControls:DropDownButton.DropDownContextMenu>
+								<Image Source="/AvalonDock.Themes.Expression;component/Images/PinMenu.png" />
+							</avalonDockControls:DropDownButton>
+						</Grid>
+						<Border
+							x:Name="ContentPanel"
+							Grid.Row="1"
+							Grid.Column="0"
+							Padding="0,1,0,2"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Stretch"
+							Background="{TemplateBinding Background}"
+							BorderBrush="{TemplateBinding BorderBrush}"
+							BorderThickness="{TemplateBinding BorderThickness}"
+							CornerRadius="3"
+							KeyboardNavigation.DirectionalNavigation="Contained"
+							KeyboardNavigation.TabIndex="2"
+							KeyboardNavigation.TabNavigation="Cycle">
+							<ContentPresenter
+								x:Name="PART_SelectedContentHost"
+								Margin="0,2,0,2"
+								ContentSource="SelectedContent"
+								SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger SourceName="MenuDropDownButton" Property="IsMouseOver" Value="True">
+							<Setter TargetName="MenuDropDownButton" Property="Content">
+								<Setter.Value>
+									<Image Source="/AvalonDock.Themes.Expression;component/Images/PinMenu_Light.png" />
+								</Setter.Value>
+							</Setter>
+						</Trigger>
+						<Trigger SourceName="MenuDropDownButton" Property="IsChecked" Value="True">
+							<Setter TargetName="MenuDropDownButton" Property="Content">
+								<Setter.Value>
+									<Image Source="/AvalonDock.Themes.Expression;component/Images/PinMenu_Light.png" />
+								</Setter.Value>
+							</Setter>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="ItemContainerStyle">
+			<Setter.Value>
+				<Style TargetType="{x:Type TabItem}">
+					<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor4}" />
+					<Setter Property="Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor2}" />
+					<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+					<Setter Property="ToolTip" Value="{Binding ToolTip}" />
+					<Setter Property="Padding" Value="2,0,2,0" />
+					<Setter Property="Margin" Value="2,0,2,0" />
+					<Setter Property="Template">
+						<Setter.Value>
+							<ControlTemplate TargetType="{x:Type TabItem}">
+								<Grid SnapsToDevicePixels="true">
+									<Border
+										x:Name="Bd"
+										Padding="{TemplateBinding Padding}"
+										Background="{TemplateBinding Background}"
+										BorderBrush="{TemplateBinding BorderBrush}"
+										CornerRadius="2,2,0,0">
+										<ContentPresenter
+											x:Name="Content"
+											HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+											VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+											ContentSource="Header"
+											RecognizesAccessKey="True"
+											SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+									</Border>
+								</Grid>
+								<ControlTemplate.Triggers>
+									<Trigger Property="Selector.IsSelected" Value="true">
+										<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor10}" />
+										<Setter Property="Margin" Value="-1,0,-1,-4" />
+										<Setter TargetName="Content" Property="Margin" Value="0,0,0,3" />
+									</Trigger>
+									<Trigger Property="IsEnabled" Value="false">
+										<Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_Expression_BaseColor13}" />
+										<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor9}" />
+										<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+									</Trigger>
+								</ControlTemplate.Triggers>
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="ItemTemplate">
+			<Setter.Value>
+				<DataTemplate>
+					<avalonDockControls:LayoutDocumentTabItem Model="{Binding}" />
+				</DataTemplate>
+			</Setter.Value>
+		</Setter>
+
+		<Setter Property="ContentTemplate">
+			<Setter.Value>
+				<DataTemplate>
+					<avalonDockControls:LayoutDocumentControl Model="{Binding}" />
+				</DataTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<!--  AnchorablePaneControlStyle  -->
+	<Style x:Key="AvalonDock_Expression_AnchorablePaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+		<Setter Property="TabStripPlacement" Value="Bottom" />
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Foreground" Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}" />
+		<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor8}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+					<Grid
+						ClipToBounds="true"
+						KeyboardNavigation.TabNavigation="Local"
+						SnapsToDevicePixels="true">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="*" />
+						</Grid.RowDefinitions>
+						<!--  Following border is required to catch mouse events  -->
+						<Border Grid.RowSpan="2" Background="Transparent" />
+
+						<Border x:Name="Header">
+							<avalonDockControls:AnchorablePaneTitle Model="{Binding Model.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}" />
+						</Border>
+
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="48" />
+							</Grid.ColumnDefinitions>
+							<avalonDockControls:AnchorablePaneTabPanel
+								x:Name="HeaderPanel"
+								Margin="0,2,0,0"
+								Panel.ZIndex="1"
+								IsItemsHost="true"
+								KeyboardNavigation.TabIndex="1" />
+						</Grid>
+
+						<Border
+							x:Name="ContentPanel"
+							Grid.Row="1"
+							Grid.Column="0"
+							Padding="1"
+							Background="{TemplateBinding Background}"
+							BorderBrush="{TemplateBinding BorderBrush}"
+							BorderThickness="{TemplateBinding BorderThickness}"
+							KeyboardNavigation.DirectionalNavigation="Contained"
+							KeyboardNavigation.TabIndex="2"
+							KeyboardNavigation.TabNavigation="Cycle">
+							<ContentPresenter
+								x:Name="PART_SelectedContentHost"
+								Margin="{TemplateBinding Padding}"
+								ContentSource="SelectedContent"
+								SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<MultiDataTrigger>
+							<!--
+								Hide the title if the control is directly hosted in floating window
+								The floating window control will show the title if there is only one control to host
+								without any other LayoutAnchorableControl
+							-->
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.IsFloating}" Value="True" />
+								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.Parent.IsDirectlyHostedInFloatingWindow}" Value="True" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="Header" Property="Visibility" Value="Collapsed" />
+						</MultiDataTrigger>
+						<MultiDataTrigger>
+							<!--
+								Also hide the title, if model cannot be bound which can happen when using virtualization
+								See Issue #148 Drop Down Menu for LayoutAnchorables is not correct with Virtualization
+							-->
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model}" Value="{x:Null}" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="Header" Property="Visibility" Value="Collapsed" />
+						</MultiDataTrigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+
+		<Setter Property="ItemContainerStyle">
+			<Setter.Value>
+				<Style TargetType="{x:Type TabItem}">
+					<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor4}" />
+					<Setter Property="Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor2}" />
+					<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+					<Setter Property="ToolTip" Value="{Binding ToolTip}" />
+					<Setter Property="Margin" Value="0,0,-10,0" />
+					<Setter Property="Template">
+						<Setter.Value>
+							<ControlTemplate TargetType="{x:Type TabItem}">
+								<Grid SnapsToDevicePixels="true">
+									<Grid.ColumnDefinitions>
+										<ColumnDefinition Width="*" />
+										<ColumnDefinition Width="22" />
+									</Grid.ColumnDefinitions>
+									<Border
+										x:Name="Bd"
+										Padding="{TemplateBinding Padding}"
+										Background="{TemplateBinding Background}"
+										BorderBrush="{TemplateBinding BorderBrush}"
+										CornerRadius="3,0,0,0">
+										<ContentPresenter
+											x:Name="Content"
+											HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+											VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+											ContentSource="Header"
+											RecognizesAccessKey="True"
+											SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+									</Border>
+
+									<localControls:SplineBorder
+										Grid.Column="1"
+										Fill="{TemplateBinding Background}"
+										Stroke="{TemplateBinding Background}" />
+								</Grid>
+								<ControlTemplate.Triggers>
+									<Trigger Property="Selector.IsSelected" Value="true">
+										<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor10}" />
+										<Setter Property="Panel.ZIndex" Value="1" />
+									</Trigger>
+									<Trigger Property="IsEnabled" Value="false">
+										<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+									</Trigger>
+									<DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ItemsControl}}" Value="1">
+										<Setter Property="IsHitTestVisible" Value="False" />
+									</DataTrigger>
+								</ControlTemplate.Triggers>
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>
+
+		<Setter Property="ItemTemplate">
+			<Setter.Value>
+				<DataTemplate>
+					<avalonDockControls:LayoutAnchorableTabItem Model="{Binding}" />
+				</DataTemplate>
+			</Setter.Value>
+		</Setter>
+
+		<Setter Property="ContentTemplate">
+			<Setter.Value>
+				<DataTemplate>
+					<avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
+				</DataTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style TargetType="avalonDockControls:AnchorablePaneTitle">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate>
+					<Border
+						Padding="0,4,0,4"
+						Background="{TemplateBinding Background}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}"
+						CornerRadius="2,2,0,0">
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+
+							<avalonDockControls:DropDownButton
+								x:Name="MenuDropDownButton"
+								Grid.Column="1"
+								VerticalAlignment="Center"
+								DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+								DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+								Focusable="False"
+								Style="{StaticResource AvalonDock_Expression_ToolButtonStyle}"
+								ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+								<Image x:Name="PART_ImgMenuPin" Source="/AvalonDock.Themes.Expression;component/Images/PinMenu.png" />
+							</avalonDockControls:DropDownButton>
+
+							<Button
+								x:Name="PART_AutoHidePin"
+								Grid.Column="2"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+								Focusable="False"
+								Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
+								ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"
+								Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}, ConverterParameter=Visibility.Hidden}">
+								<Image x:Name="PART_ImgAutoHidePin" Source="/AvalonDock.Themes.Expression;component/Images/PinAutoHide.png" />
+							</Button>
+
+							<Button
+								x:Name="PART_HidePin"
+								Grid.Column="3"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+								Focusable="False"
+								Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
+								ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+								Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
+								<Image x:Name="PART_ImgHidePin" Source="/AvalonDock.Themes.Expression;component/Images/PinClose.png" />
+							</Button>
+
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor5}" />
+						</Trigger>
+						<DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+							<Setter TargetName="PART_AutoHidePin" Property="LayoutTransform">
+								<Setter.Value>
+									<RotateTransform Angle="90" />
+								</Setter.Value>
+							</Setter>
+						</DataTrigger>
+						<Trigger SourceName="MenuDropDownButton" Property="IsMouseOver" Value="True">
+							<Setter TargetName="PART_ImgMenuPin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinMenu_Light.png" />
+						</Trigger>
+						<Trigger SourceName="MenuDropDownButton" Property="IsChecked" Value="True">
+							<Setter TargetName="PART_ImgMenuPin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinMenu_Light.png" />
+						</Trigger>
+						<Trigger SourceName="PART_AutoHidePin" Property="IsMouseOver" Value="True">
+							<Setter TargetName="PART_ImgAutoHidePin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinAutoHide_Light.png" />
+						</Trigger>
+						<Trigger SourceName="PART_HidePin" Property="IsMouseOver" Value="True">
+							<Setter TargetName="PART_ImgHidePin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinClose_Light.png" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<ControlTemplate x:Key="AvalonDock_Expression_AnchorSideTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
+		<ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+			<ItemsControl.ItemsPanel>
+				<ItemsPanelTemplate>
+					<StackPanel
+						MinWidth="4"
+						MinHeight="4"
+						Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={avalonDockConverters:AnchorSideToOrientationConverter}}" />
+				</ItemsPanelTemplate>
+			</ItemsControl.ItemsPanel>
+		</ItemsControl>
+	</ControlTemplate>
+
+	<ControlTemplate x:Key="AvalonDock_Expression_AnchorGroupTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
+		<ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+			<ItemsControl.LayoutTransform>
+				<RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={avalonDockConverters:AnchorSideToAngleConverter}}" />
+			</ItemsControl.LayoutTransform>
+			<ItemsControl.ItemsPanel>
+				<ItemsPanelTemplate>
+					<StackPanel Orientation="Horizontal" />
+				</ItemsPanelTemplate>
+			</ItemsControl.ItemsPanel>
+		</ItemsControl>
+	</ControlTemplate>
+
+	<ControlTemplate x:Key="AvalonDock_Expression_AnchorTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
+		<Border
+			x:Name="Bd"
+			Margin="0,4,2,0"
+			Padding="2"
+			Background="{DynamicResource AvalonDock_Expression_BaseColor4}"
+			CornerRadius="3,3,0,0">
+			<ContentPresenter
+				Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+				ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+				ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+				TextElement.Foreground="{DynamicResource AvalonDock_Expression_BaseColor2}" />
+		</Border>
+		<ControlTemplate.Triggers>
+			<Trigger Property="Side" Value="Right">
+				<Setter TargetName="Bd" Property="CornerRadius" Value="0,0,3,3" />
+				<Setter TargetName="Bd" Property="Margin" Value="0,0,2,4" />
+			</Trigger>
+			<Trigger Property="Side" Value="Bottom">
+				<Setter TargetName="Bd" Property="CornerRadius" Value="3,3,0,0" />
+				<Setter TargetName="Bd" Property="Margin" Value="2,4,0,0" />
+			</Trigger>
+			<Trigger Property="Side" Value="Top">
+				<Setter TargetName="Bd" Property="CornerRadius" Value="0,0,3,3" />
+				<Setter TargetName="Bd" Property="Margin" Value="0,0,2,4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" />
+					<Condition Property="Selector.IsSelected" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter TargetName="Bd" Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor10}" />
+			</MultiTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+
+	<Style x:Key="{x:Type avalonDockControls:OverlayWindow}" TargetType="{x:Type avalonDockControls:OverlayWindow}">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
+					<Canvas x:Name="PART_DropTargetsContainer" Opacity="0.9">
+						<Path
+							x:Name="PART_PreviewBox"
+							Fill="AliceBlue"
+							Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"
+							StrokeThickness="2" />
+						<Grid x:Name="PART_DockingManagerDropTargets">
+							<Border
+								x:Name="PART_DockingManagerDropTargetLeft"
+								Width="10"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Stretch" />
+							<Border
+								x:Name="PART_DockingManagerDropTargetRight"
+								Width="10"
+								HorizontalAlignment="Right"
+								VerticalAlignment="Stretch" />
+							<Border
+								x:Name="PART_DockingManagerDropTargetBottom"
+								Height="10"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Bottom" />
+							<Border
+								x:Name="PART_DockingManagerDropTargetTop"
+								Height="10"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Top" />
+						</Grid>
+						<Grid x:Name="PART_AnchorablePaneDropTargets">
+							<Border
+								x:Name="PART_AnchorablePaneDropTargetLeft"
+								Width="10"
+								Margin="10,0,0,0"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Stretch" />
+							<Border
+								x:Name="PART_AnchorablePaneDropTargetRight"
+								Width="10"
+								Margin="0,0,10,0"
+								HorizontalAlignment="Right"
+								VerticalAlignment="Stretch" />
+							<Border
+								x:Name="PART_AnchorablePaneDropTargetBottom"
+								Height="10"
+								Margin="0,10,0,0"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Bottom" />
+							<Border
+								x:Name="PART_AnchorablePaneDropTargetTop"
+								Height="10"
+								Margin="0,0,0,10"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Top" />
+							<Border
+								x:Name="PART_AnchorablePaneDropTargetInto"
+								Width="0"
+								Height="0"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center" />
+						</Grid>
+						<Grid x:Name="PART_DocumentPaneDropTargets">
+							<Border
+								x:Name="PART_DocumentPaneDropTargetLeft"
+								Width="10"
+								Margin="10,0,0,0"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Stretch" />
+							<Border
+								x:Name="PART_DocumentPaneDropTargetRight"
+								Width="10"
+								Margin="0,0,10,0"
+								HorizontalAlignment="Right"
+								VerticalAlignment="Stretch" />
+							<Border
+								x:Name="PART_DocumentPaneDropTargetBottom"
+								Height="10"
+								Margin="0,10,0,0"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Bottom" />
+							<Border
+								x:Name="PART_DocumentPaneDropTargetTop"
+								Height="10"
+								Margin="0,0,0,10"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Top" />
+							<Border
+								x:Name="PART_DocumentPaneDropTargetInto"
+								Width="0"
+								Height="0"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center" />
+						</Grid>
+
+						<Grid x:Name="PART_DocumentPaneFullDropTargets">
+							<Border
+								x:Name="PART_DocumentPaneFullDropTargetLeft"
+								Width="10"
+								Margin="15,0,0,0"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Stretch" />
+							<Border
+								x:Name="PART_DocumentPaneFullDropTargetRight"
+								Width="10"
+								Margin="0,0,15,0"
+								HorizontalAlignment="Right"
+								VerticalAlignment="Stretch" />
+							<Border
+								x:Name="PART_DocumentPaneFullDropTargetBottom"
+								Height="10"
+								Margin="0,15,0,0"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Bottom" />
+							<Border
+								x:Name="PART_DocumentPaneFullDropTargetTop"
+								Height="10"
+								Margin="0,0,0,15"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Top" />
+							<Border
+								x:Name="PART_DocumentPaneFullDropTargetInto"
+								Width="0"
+								Height="0"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center" />
+
+							<Border
+								x:Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane"
+								Width="15"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Stretch" />
+							<Border
+								x:Name="PART_DocumentPaneDropTargetRightAsAnchorablePane"
+								Width="15"
+								HorizontalAlignment="Right"
+								VerticalAlignment="Stretch" />
+							<Border
+								x:Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane"
+								Height="15"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Bottom" />
+							<Border
+								x:Name="PART_DocumentPaneDropTargetTopAsAnchorablePane"
+								Height="15"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Top" />
+
+						</Grid>
+
+					</Canvas>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<DataTemplate x:Key="AvalonDock_Expression_DocumentHeaderTemplate">
+		<TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
+	</DataTemplate>
+
+	<DataTemplate x:Key="AvalonDock_Expression_AnchorableHeaderTemplate">
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<Image
+				x:Name="icon"
+				Source="{Binding IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}"
+				Stretch="Uniform" />
+			<TextBlock
+				x:Name="title"
+				Grid.Column="1"
+				Margin="4,0,0,0"
+				Text="{Binding Title}"
+				TextTrimming="CharacterEllipsis" />
+		</Grid>
+		<DataTemplate.Triggers>
+			<DataTrigger Binding="{Binding IconSource}" Value="{x:Null}">
+				<Setter TargetName="title" Property="Margin" Value="0" />
+			</DataTrigger>
+		</DataTemplate.Triggers>
+	</DataTemplate>
+
+	<DataTemplate x:Key="AvalonDock_Expression_DocumentTitleTemplate">
+		<TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
+	</DataTemplate>
+
+	<DataTemplate x:Key="AvalonDock_Expression_AnchorableTitleTemplate">
+		<TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
+	</DataTemplate>
+
+	<DataTemplate x:Key="AvalonDock_Expression_IconContentTemplate">
+		<Image Source="{Binding IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}" Stretch="Uniform" />
+	</DataTemplate>
+
+	<ContextMenu x:Key="AvalonDock_Expression_AnchorableContextMenu">
+		<MenuItem Command="{Binding Path=FloatCommand}" Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}" />
+		<MenuItem Command="{Binding Path=DockCommand}" Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}" />
+		<MenuItem Command="{Binding Path=DockAsDocumentCommand}" Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}" />
+		<MenuItem Command="{Binding Path=AutoHideCommand}" Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}" />
+		<MenuItem
+			Command="{Binding Path=CloseCommand}"
+			Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}"
+			Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}" />
+	</ContextMenu>
+
+	<ContextMenu x:Key="AvalonDock_Expression_DocumentContextMenu">
+		<MenuItem
+			Command="{Binding Path=CloseCommand}"
+			Header="{x:Static avalonDockProperties:Resources.Document_Close}"
+			Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}" />
+		<MenuItem Command="{Binding Path=CloseAllButThisCommand}" Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" />
+		<MenuItem Command="{Binding Path=FloatCommand}" Header="{x:Static avalonDockProperties:Resources.Document_Float}" />
+		<MenuItem Command="{Binding Path=DockAsDocumentCommand}" Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" />
+		<MenuItem
+			Command="{Binding Path=NewHorizontalTabGroupCommand}"
+			Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}"
+			Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
+			<MenuItem.Icon>
+				<Image
+					Width="14"
+					Source="/AvalonDock.Themes.Expression;component/Images/HTabGroup.png"
+					Stretch="Uniform" />
+			</MenuItem.Icon>
+		</MenuItem>
+
+		<MenuItem
+			Command="{Binding Path=NewVerticalTabGroupCommand}"
+			Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}"
+			Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
+			<MenuItem.Icon>
+				<Image
+					Width="14"
+					Source="/AvalonDock.Themes.Expression;component/Images/VTabGroup.png"
+					Stretch="Uniform" />
+			</MenuItem.Icon>
+		</MenuItem>
+		<MenuItem
+			Command="{Binding Path=MoveToNextTabGroupCommand}"
+			Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}"
+			Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}" />
+		<MenuItem
+			Command="{Binding Path=MoveToPreviousTabGroupCommand}"
+			Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}"
+			Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}" />
+	</ContextMenu>
+
+	<!--  DockingManager  -->
+	<Style x:Key="{x:Type avalonDock:DockingManager}" TargetType="{x:Type avalonDock:DockingManager}">
+		<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor1}" />
+		<Setter Property="DocumentPaneControlStyle" Value="{StaticResource AvalonDock_Expression_DocumentPaneControlStyle}" />
+		<Setter Property="AnchorablePaneControlStyle" Value="{StaticResource AvalonDock_Expression_AnchorablePaneControlStyle}" />
+		<Setter Property="AnchorSideTemplate" Value="{StaticResource AvalonDock_Expression_AnchorSideTemplate}" />
+		<Setter Property="AnchorGroupTemplate" Value="{StaticResource AvalonDock_Expression_AnchorGroupTemplate}" />
+		<Setter Property="AnchorTemplate" Value="{StaticResource AvalonDock_Expression_AnchorTemplate}" />
+		<Setter Property="DocumentHeaderTemplate" Value="{StaticResource AvalonDock_Expression_DocumentHeaderTemplate}" />
+		<Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AvalonDock_Expression_AnchorableHeaderTemplate}" />
+		<Setter Property="DocumentTitleTemplate" Value="{StaticResource AvalonDock_Expression_DocumentTitleTemplate}" />
+		<Setter Property="AnchorableTitleTemplate" Value="{StaticResource AvalonDock_Expression_AnchorableTitleTemplate}" />
+		<Setter Property="AnchorableContextMenu" Value="{StaticResource AvalonDock_Expression_AnchorableContextMenu}" />
+		<Setter Property="DocumentContextMenu" Value="{StaticResource AvalonDock_Expression_DocumentContextMenu}" />
+		<Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource AvalonDock_Expression_DocumentHeaderTemplate}" />
+		<Setter Property="IconContentTemplate" Value="{StaticResource AvalonDock_Expression_IconContentTemplate}" />
+		<Setter Property="GridSplitterWidth" Value="4" />
+		<Setter Property="GridSplitterHeight" Value="4" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
+					<Border
+						Background="{TemplateBinding Background}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}">
+						<Grid>
+							<Grid.RowDefinitions>
+								<RowDefinition Height="Auto" />
+								<RowDefinition Height="*" />
+								<RowDefinition Height="Auto" />
+							</Grid.RowDefinitions>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+							<ContentPresenter
+								Grid.Row="1"
+								Grid.Column="1"
+								Content="{TemplateBinding LayoutRootPanel}" />
+							<ContentPresenter
+								Grid.Row="1"
+								Grid.Column="2"
+								Content="{TemplateBinding RightSidePanel}" />
+							<ContentPresenter
+								Grid.Row="1"
+								Grid.Column="0"
+								Content="{TemplateBinding LeftSidePanel}" />
+							<ContentPresenter
+								Grid.Row="0"
+								Grid.Column="1"
+								Content="{TemplateBinding TopSidePanel}" />
+							<ContentPresenter
+								Grid.Row="2"
+								Grid.Column="1"
+								Content="{TemplateBinding BottomSidePanel}" />
+							<ContentPresenter
+								x:Name="PART_AutoHideArea"
+								Grid.Row="1"
+								Grid.Column="1"
+								HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+								VerticalAlignment="{TemplateBinding VerticalAlignment}"
+								Content="{TemplateBinding AutoHideWindow}" />
+						</Grid>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<!--  LayoutGridResizerControl  -->
+	<Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}" TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+					<Border Background="{TemplateBinding Background}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+					<Border
+						Background="{TemplateBinding Background}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}">
+						<ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}" />
+						<!--<ContentPresenter Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}"
                                           ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                           ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>-->
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
-                    <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}" DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
-                        <Border
-                            Padding="0,2,0,1"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Border Grid.ColumnSpan="2" Background="Transparent" />
-                                <ContentPresenter
-                                    Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                                    ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
-                                <!--  Close button should be moved out to the container style  -->
-                                <Button
-                                    x:Name="DocumentCloseButton"
-                                    Grid.Column="1"
-                                    Margin="1,-5,-3,-6"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
-                                    ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
-                                    Visibility="Hidden">
-                                    <Image x:Name="PART_ImgPinClose" Source="/AvalonDock.Themes.Expression;component/Images/PinClose.png" />
-                                </Button>
-                            </Grid>
-                        </Border>
-                    </avalonDockControls:DropDownControlArea>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding Path=IsSelected}" Value="true">
-                            <Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
-                        </DataTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                        <DataTrigger Binding="{Binding Path=CanClose}" Value="false">
-                            <Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Collapsed" />
-                        </DataTrigger>
-                        <Trigger SourceName="DocumentCloseButton" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ImgPinClose" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinClose_Light.png" />
-                        </Trigger>
-
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
-                    <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}" DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
-                        <Border
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-
-                                <ContentPresenter
-                                    Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                                    ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                                    ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
-                                <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}" DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}" />
-
-                                <Button
-                                    x:Name="PART_HidePin"
-                                    Grid.Column="1"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Focusable="False"
-                                    Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
-                                    ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
-                                    Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-                                    <Image x:Name="PART_ImgHidePin" Source="/AvalonDock.Themes.Expression;component/Images/PinClose.png" />
-                                </Button>
-
-                            </Grid>
-                        </Border>
-                    </avalonDockControls:DropDownControlArea>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding Model.IsSelected}" Value="False">
-                            <Setter TargetName="PART_HidePin" Property="Visibility" Value="Collapsed" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ItemsControl}}" Value="1">
-                            <Setter TargetName="PART_HidePin" Property="Visibility" Value="Collapsed" />
-                        </DataTrigger>
-                        <Trigger SourceName="PART_HidePin" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ImgHidePin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinClose_Light.png" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-                    <Border
-                        x:Name="Bd"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <!--<ContentPresenter
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+					<avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}" DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+						<Border
+							Padding="0,2,0,1"
+							Background="{TemplateBinding Background}"
+							BorderBrush="{TemplateBinding BorderBrush}"
+							BorderThickness="{TemplateBinding BorderThickness}">
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="*" />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<Border Grid.ColumnSpan="2" Background="Transparent" />
+								<ContentPresenter
+									Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+									ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+									ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+								<!--  Close button should be moved out to the container style  -->
+								<Button
+									x:Name="DocumentCloseButton"
+									Grid.Column="1"
+									Margin="1,-5,-3,-6"
+									HorizontalAlignment="Center"
+									VerticalAlignment="Center"
+									Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+									Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
+									ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
+									Visibility="Hidden">
+									<Image x:Name="PART_ImgPinClose" Source="/AvalonDock.Themes.Expression;component/Images/PinClose.png" />
+								</Button>
+							</Grid>
+						</Border>
+					</avalonDockControls:DropDownControlArea>
+					<ControlTemplate.Triggers>
+						<DataTrigger Binding="{Binding Path=IsSelected}" Value="true">
+							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
+						</DataTrigger>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
+						</Trigger>
+						<DataTrigger Binding="{Binding Path=CanClose}" Value="false">
+							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Collapsed" />
+						</DataTrigger>
+						<Trigger SourceName="DocumentCloseButton" Property="IsMouseOver" Value="True">
+							<Setter TargetName="PART_ImgPinClose" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinClose_Light.png" />
+						</Trigger>
+
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+					<avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}" DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+						<Border
+							Background="{TemplateBinding Background}"
+							BorderBrush="{TemplateBinding BorderBrush}"
+							BorderThickness="{TemplateBinding BorderThickness}">
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+
+								<ContentPresenter
+									Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+									ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+									ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+								<avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}" DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}" />
+
+								<Button
+									x:Name="PART_HidePin"
+									Grid.Column="1"
+									HorizontalAlignment="Center"
+									VerticalAlignment="Center"
+									Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+									Focusable="False"
+									Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
+									ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+									Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
+									<Image x:Name="PART_ImgHidePin" Source="/AvalonDock.Themes.Expression;component/Images/PinClose.png" />
+								</Button>
+
+							</Grid>
+						</Border>
+					</avalonDockControls:DropDownControlArea>
+					<ControlTemplate.Triggers>
+						<DataTrigger Binding="{Binding Model.IsSelected}" Value="False">
+							<Setter TargetName="PART_HidePin" Property="Visibility" Value="Collapsed" />
+						</DataTrigger>
+						<DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ItemsControl}}" Value="1">
+							<Setter TargetName="PART_HidePin" Property="Visibility" Value="Collapsed" />
+						</DataTrigger>
+						<Trigger SourceName="PART_HidePin" Property="IsMouseOver" Value="True">
+							<Setter TargetName="PART_ImgHidePin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinClose_Light.png" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+					<Border
+						x:Name="Bd"
+						Background="{TemplateBinding Background}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}">
+						<Grid>
+							<!--<ContentPresenter
                                 Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}"
                                 ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                 ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                 />-->
-                            <!--
-                                Added ContentTemplate and ContentTemplateSelector
-                                https://github.com/xceedsoftware/wpftoolkit/issues/1525
-                            -->
-                            <ContentPresenter
-                                Grid.Row="1"
-                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
-                                ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"
-                                FlowDirection="{TemplateBinding FlowDirection}" />
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
-        <Setter Property="Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor2}" />
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor4}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_Expression_BaseColor10}" />
-        <Setter Property="shell:WindowChrome.WindowChrome">
-            <Setter.Value>
-                <shell:WindowChrome
-                    CaptionHeight="18"
-                    CornerRadius="0"
-                    GlassFrameThickness="0"
-                    ResizeBorderThickness="10"
-                    ShowSystemMenu="False" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
-                    <Grid>
-                        <Border
-                            x:Name="WindowBorder"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="1">
-                            <Grid Margin="3">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="18" />
-                                    <RowDefinition Height="*" />
-                                </Grid.RowDefinitions>
-                                <Border x:Name="Header" Padding="2,0,2,0">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <ContentPresenter
-                                            Content="{Binding Model.SinglePane.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                            ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
-
-                                        <Button
-                                            x:Name="PART_PinMaximize"
-                                            Grid.Column="1"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            Focusable="False"
-                                            Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:InverseBoolToVisibilityConverter}}">
-                                            <Image
-                                                x:Name="PART_ImgPinMaximize"
-                                                Width="13"
-                                                Source="/AvalonDock.Themes.Expression;component/Images/PinMaximize.png" />
-                                        </Button>
-
-                                        <Button
-                                            x:Name="PART_PinRestore"
-                                            Grid.Column="1"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
-                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                            Focusable="False"
-                                            Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
-                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-                                            <Image
-                                                x:Name="PART_ImgPinRestore"
-                                                Width="13"
-                                                Source="/AvalonDock.Themes.Expression;component/Images/PinRestore.png" />
-                                        </Button>
-
-                                        <Button
-                                            x:Name="PART_PinClose"
-                                            Grid.Column="2"
-                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                            Command="{Binding Path=CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                            Focusable="False"
-                                            Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
-                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
-                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-                                            <Image
-                                                x:Name="PART_ImgPinClose"
-                                                Width="13"
-                                                Source="/AvalonDock.Themes.Expression;component/Images/PinClose.png" />
-                                        </Button>
-                                    </Grid>
-                                </Border>
-                                <ContentPresenter Grid.Row="1" Content="{TemplateBinding Content}" />
-                            </Grid>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <!--  Show Header Bar (Window Title and Restore/Maximize/Minimize buttons with highlighting color if this IsActive)  -->
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter TargetName="WindowBorder" Property="Padding" Value="3" />
-                        </Trigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true">
-                            <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor10}" />
-                        </DataTrigger>
-
-                        <Trigger SourceName="PART_PinMaximize" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ImgPinMaximize" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinMaximize_Light.png" />
-                        </Trigger>
-                        <Trigger SourceName="PART_PinRestore" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ImgPinRestore" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinRestore_Light.png" />
-                        </Trigger>
-                        <Trigger SourceName="PART_PinClose" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ImgPinClose" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinClose_Light.png" />
-                        </Trigger>
-
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor1}" />
-        <Setter Property="shell:WindowChrome.WindowChrome">
-            <Setter.Value>
-                <shell:WindowChrome
-                    CaptionHeight="13"
-                    CornerRadius="0"
-                    GlassFrameThickness="0"
-                    ResizeBorderThickness="10" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
-                    <Grid>
-                        <Border
-                            x:Name="WindowBorder"
-                            Padding="3"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{DynamicResource AvalonDock_Expression_BaseColor10}"
-                            BorderThickness="2">
-
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="*" />
-                                </Grid.RowDefinitions>
-                                <!--<Grid.ColumnDefinitions>
+							<!--
+								Added ContentTemplate and ContentTemplateSelector
+								https://github.com/xceedsoftware/wpftoolkit/issues/1525
+							-->
+							<ContentPresenter
+								Grid.Row="1"
+								Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
+								ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+								ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"
+								FlowDirection="{TemplateBinding FlowDirection}" />
+						</Grid>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+		<Setter Property="Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor2}" />
+		<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor4}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_Expression_BaseColor10}" />
+		<Setter Property="shell:WindowChrome.WindowChrome">
+			<Setter.Value>
+				<shell:WindowChrome
+					CaptionHeight="18"
+					CornerRadius="0"
+					GlassFrameThickness="0"
+					ResizeBorderThickness="10"
+					ShowSystemMenu="False" />
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+					<Grid>
+						<Border
+							x:Name="WindowBorder"
+							Background="{TemplateBinding Background}"
+							BorderBrush="{TemplateBinding BorderBrush}"
+							BorderThickness="1">
+							<Grid Margin="3">
+								<Grid.RowDefinitions>
+									<RowDefinition Height="18" />
+									<RowDefinition Height="*" />
+								</Grid.RowDefinitions>
+								<Border x:Name="Header" Padding="2,0,2,0">
+									<Grid>
+										<Grid.ColumnDefinitions>
+											<ColumnDefinition Width="*" />
+											<ColumnDefinition Width="Auto" />
+											<ColumnDefinition Width="Auto" />
+										</Grid.ColumnDefinitions>
+										<ContentPresenter
+											Content="{Binding Model.SinglePane.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}"
+											ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+											ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
+
+										<Button
+											x:Name="PART_PinMaximize"
+											Grid.Column="1"
+											shell:WindowChrome.IsHitTestVisibleInChrome="True"
+											Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+											CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+											Focusable="False"
+											Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
+											ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+											Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:InverseBoolToVisibilityConverter}}">
+											<Image
+												x:Name="PART_ImgPinMaximize"
+												Width="13"
+												Source="/AvalonDock.Themes.Expression;component/Images/PinMaximize.png" />
+										</Button>
+
+										<Button
+											x:Name="PART_PinRestore"
+											Grid.Column="1"
+											shell:WindowChrome.IsHitTestVisibleInChrome="True"
+											Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+											CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+											Focusable="False"
+											Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
+											ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+											Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
+											<Image
+												x:Name="PART_ImgPinRestore"
+												Width="13"
+												Source="/AvalonDock.Themes.Expression;component/Images/PinRestore.png" />
+										</Button>
+
+										<Button
+											x:Name="PART_PinClose"
+											Grid.Column="2"
+											shell:WindowChrome.IsHitTestVisibleInChrome="True"
+											Command="{Binding Path=CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
+											Focusable="False"
+											Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
+											ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
+											Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
+											<Image
+												x:Name="PART_ImgPinClose"
+												Width="13"
+												Source="/AvalonDock.Themes.Expression;component/Images/PinClose.png" />
+										</Button>
+									</Grid>
+								</Border>
+								<ContentPresenter Grid.Row="1" Content="{TemplateBinding Content}" />
+							</Grid>
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<!--  Show Header Bar (Window Title and Restore/Maximize/Minimize buttons with highlighting color if this IsActive)  -->
+						<Trigger Property="WindowState" Value="Maximized">
+							<Setter TargetName="WindowBorder" Property="Padding" Value="3" />
+						</Trigger>
+						<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true">
+							<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor10}" />
+						</DataTrigger>
+
+						<Trigger SourceName="PART_PinMaximize" Property="IsMouseOver" Value="True">
+							<Setter TargetName="PART_ImgPinMaximize" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinMaximize_Light.png" />
+						</Trigger>
+						<Trigger SourceName="PART_PinRestore" Property="IsMouseOver" Value="True">
+							<Setter TargetName="PART_ImgPinRestore" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinRestore_Light.png" />
+						</Trigger>
+						<Trigger SourceName="PART_PinClose" Property="IsMouseOver" Value="True">
+							<Setter TargetName="PART_ImgPinClose" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinClose_Light.png" />
+						</Trigger>
+
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+		<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor1}" />
+		<Setter Property="shell:WindowChrome.WindowChrome">
+			<Setter.Value>
+				<shell:WindowChrome
+					CaptionHeight="13"
+					CornerRadius="0"
+					GlassFrameThickness="0"
+					ResizeBorderThickness="10" />
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+					<Grid>
+						<Border
+							x:Name="WindowBorder"
+							Padding="3"
+							Background="{TemplateBinding Background}"
+							BorderBrush="{DynamicResource AvalonDock_Expression_BaseColor10}"
+							BorderThickness="2">
+
+							<Grid>
+								<Grid.RowDefinitions>
+									<RowDefinition Height="Auto" />
+									<RowDefinition Height="*" />
+								</Grid.RowDefinitions>
+								<!--<Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="16"/>
                                 </Grid.ColumnDefinitions>-->
-                                <ContentPresenter
-                                    Grid.Row="1"
-                                    Grid.ColumnSpan="4"
-                                    Content="{TemplateBinding Content}" />
-                                <Button
-                                    x:Name="PART_PinMaximize"
-                                    Grid.Column="2"
-                                    HorizontalAlignment="Right"
-                                    VerticalAlignment="Center"
-                                    HorizontalContentAlignment="Center"
-                                    VerticalContentAlignment="Center"
-                                    Panel.ZIndex="100"
-                                    shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                    Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
-                                    CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                    Focusable="False"
-                                    Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
-                                    ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
-                                    Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:InverseBoolToVisibilityConverter}}">
-                                    <Image
-                                        x:Name="PART_ImgPinMaximize"
-                                        Width="13"
-                                        Source="/AvalonDock.Themes.Expression;component/Images/PinMaximize.png" />
-                                </Button>
-                                <Button
-                                    x:Name="PART_PinRestore"
-                                    Grid.Column="2"
-                                    HorizontalAlignment="Right"
-                                    VerticalAlignment="Center"
-                                    shell:WindowChrome.IsHitTestVisibleInChrome="True"
-                                    Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
-                                    CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                    Focusable="False"
-                                    Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
-                                    ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
-                                    Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-                                    <Image
-                                        x:Name="PART_ImgPinRestore"
-                                        Width="13"
-                                        Source="/AvalonDock.Themes.Expression;component/Images/PinRestore.png" />
-                                </Button>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter TargetName="WindowBorder" Property="Padding" Value="5" />
-                        </Trigger>
-                        <Trigger SourceName="PART_PinMaximize" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ImgPinMaximize" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinMaximize_Light.png" />
-                        </Trigger>
-                        <Trigger SourceName="PART_PinRestore" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ImgPinRestore" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinRestore_Light.png" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor5}" />
-        <Setter Property="TextElement.Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor2}" />
-        <Setter Property="AnchorableStyle">
-            <Setter.Value>
-                <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-                                <Border
-                                    x:Name="Bd"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}">
-                                    <Grid>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="*" />
-                                        </Grid.RowDefinitions>
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="*" />
-                                                <ColumnDefinition Width="Auto" />
-                                                <ColumnDefinition Width="Auto" />
-                                                <ColumnDefinition Width="Auto" />
-                                            </Grid.ColumnDefinitions>
-
-                                            <avalonDockControls:DropDownButton
-                                                x:Name="MenuDropDownButton"
-                                                Grid.Column="1"
-                                                VerticalAlignment="Center"
-                                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Focusable="False"
-                                                Style="{StaticResource AvalonDock_Expression_ToolButtonStyle}"
-                                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
-                                                <Image x:Name="PART_ImgMenuPin" Source="/AvalonDock.Themes.Expression;component/Images/PinMenu.png" />
-                                            </avalonDockControls:DropDownButton>
-
-                                            <Button
-                                                x:Name="PART_AutoHidePin"
-                                                Grid.Column="2"
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Focusable="False"
-                                                Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
-                                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"
-                                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}, ConverterParameter=Visibility.Hidden}">
-                                                <Image x:Name="PART_ImgAutoHidePin" Source="/AvalonDock.Themes.Expression;component/Images/PinAutoHide.png" />
-                                                <Button.LayoutTransform>
-                                                    <RotateTransform Angle="90" />
-                                                </Button.LayoutTransform>
-                                            </Button>
-
-                                            <Button
-                                                x:Name="PART_HidePin"
-                                                Grid.Column="3"
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Focusable="False"
-                                                Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
-                                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
-                                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-                                                <Image x:Name="PART_ImgHidePin" Source="/AvalonDock.Themes.Expression;component/Images/PinClose.png" />
-                                            </Button>
-
-                                            <Grid Margin="0,2,0,0" SnapsToDevicePixels="true">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="*" />
-                                                    <ColumnDefinition Width="22" />
-                                                </Grid.ColumnDefinitions>
-                                                <Border
-                                                    x:Name="intBd"
-                                                    Padding="2"
-                                                    Background="{DynamicResource AvalonDock_Expression_BaseColor8}"
-                                                    BorderBrush="{DynamicResource AvalonDock_Expression_BaseColor8}"
-                                                    CornerRadius="3,0,0,0">
-                                                    <ContentPresenter
-                                                        Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                                                        ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
-                                                        ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
-                                                </Border>
-                                                <localControls:SplineBorder
-                                                    x:Name="intSplineBorder"
-                                                    Grid.Column="1"
-                                                    Fill="{DynamicResource AvalonDock_Expression_BaseColor8}"
-                                                    Stroke="{DynamicResource AvalonDock_Expression_BaseColor8}" />
-                                                <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}" DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}" />
-                                            </Grid>
-                                        </Grid>
-                                        <ContentPresenter
-                                            Grid.Row="1"
-                                            Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
-                                            FlowDirection="{TemplateBinding FlowDirection}" />
-
-
-                                        <!--<ContentPresenter
+								<ContentPresenter
+									Grid.Row="1"
+									Grid.ColumnSpan="4"
+									Content="{TemplateBinding Content}" />
+								<Button
+									x:Name="PART_PinMaximize"
+									Grid.Column="2"
+									HorizontalAlignment="Right"
+									VerticalAlignment="Center"
+									HorizontalContentAlignment="Center"
+									VerticalContentAlignment="Center"
+									Panel.ZIndex="100"
+									shell:WindowChrome.IsHitTestVisibleInChrome="True"
+									Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+									CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+									Focusable="False"
+									Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
+									ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+									Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:InverseBoolToVisibilityConverter}}">
+									<Image
+										x:Name="PART_ImgPinMaximize"
+										Width="13"
+										Source="/AvalonDock.Themes.Expression;component/Images/PinMaximize.png" />
+								</Button>
+								<Button
+									x:Name="PART_PinRestore"
+									Grid.Column="2"
+									HorizontalAlignment="Right"
+									VerticalAlignment="Center"
+									shell:WindowChrome.IsHitTestVisibleInChrome="True"
+									Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+									CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+									Focusable="False"
+									Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
+									ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+									Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
+									<Image
+										x:Name="PART_ImgPinRestore"
+										Width="13"
+										Source="/AvalonDock.Themes.Expression;component/Images/PinRestore.png" />
+								</Button>
+							</Grid>
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="WindowState" Value="Maximized">
+							<Setter TargetName="WindowBorder" Property="Padding" Value="5" />
+						</Trigger>
+						<Trigger SourceName="PART_PinMaximize" Property="IsMouseOver" Value="True">
+							<Setter TargetName="PART_ImgPinMaximize" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinMaximize_Light.png" />
+						</Trigger>
+						<Trigger SourceName="PART_PinRestore" Property="IsMouseOver" Value="True">
+							<Setter TargetName="PART_ImgPinRestore" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinRestore_Light.png" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
+		<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor5}" />
+		<Setter Property="TextElement.Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor2}" />
+		<Setter Property="AnchorableStyle">
+			<Setter.Value>
+				<Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+					<Setter Property="Template">
+						<Setter.Value>
+							<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+								<Border
+									x:Name="Bd"
+									Background="{TemplateBinding Background}"
+									BorderBrush="{TemplateBinding BorderBrush}"
+									BorderThickness="{TemplateBinding BorderThickness}">
+									<Grid>
+										<Grid.RowDefinitions>
+											<RowDefinition Height="Auto" />
+											<RowDefinition Height="*" />
+										</Grid.RowDefinitions>
+										<Grid>
+											<Grid.ColumnDefinitions>
+												<ColumnDefinition Width="*" />
+												<ColumnDefinition Width="Auto" />
+												<ColumnDefinition Width="Auto" />
+												<ColumnDefinition Width="Auto" />
+											</Grid.ColumnDefinitions>
+
+											<avalonDockControls:DropDownButton
+												x:Name="MenuDropDownButton"
+												Grid.Column="1"
+												VerticalAlignment="Center"
+												DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+												DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+												Focusable="False"
+												Style="{StaticResource AvalonDock_Expression_ToolButtonStyle}"
+												ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+												<Image x:Name="PART_ImgMenuPin" Source="/AvalonDock.Themes.Expression;component/Images/PinMenu.png" />
+											</avalonDockControls:DropDownButton>
+
+											<Button
+												x:Name="PART_AutoHidePin"
+												Grid.Column="2"
+												HorizontalAlignment="Center"
+												VerticalAlignment="Center"
+												Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+												Focusable="False"
+												Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
+												ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"
+												Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}, ConverterParameter=Visibility.Hidden}">
+												<Image x:Name="PART_ImgAutoHidePin" Source="/AvalonDock.Themes.Expression;component/Images/PinAutoHide.png" />
+												<Button.LayoutTransform>
+													<RotateTransform Angle="90" />
+												</Button.LayoutTransform>
+											</Button>
+
+											<Button
+												x:Name="PART_HidePin"
+												Grid.Column="3"
+												HorizontalAlignment="Center"
+												VerticalAlignment="Center"
+												Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}"
+												Focusable="False"
+												Style="{StaticResource AvalonDock_Expression_ButtonStyle}"
+												ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+												Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
+												<Image x:Name="PART_ImgHidePin" Source="/AvalonDock.Themes.Expression;component/Images/PinClose.png" />
+											</Button>
+
+											<Grid Margin="0,2,0,0" SnapsToDevicePixels="true">
+												<Grid.ColumnDefinitions>
+													<ColumnDefinition Width="*" />
+													<ColumnDefinition Width="22" />
+												</Grid.ColumnDefinitions>
+												<Border
+													x:Name="intBd"
+													Padding="2"
+													Background="{DynamicResource AvalonDock_Expression_BaseColor8}"
+													BorderBrush="{DynamicResource AvalonDock_Expression_BaseColor8}"
+													CornerRadius="3,0,0,0">
+													<ContentPresenter
+														Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+														ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+														ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+												</Border>
+												<localControls:SplineBorder
+													x:Name="intSplineBorder"
+													Grid.Column="1"
+													Fill="{DynamicResource AvalonDock_Expression_BaseColor8}"
+													Stroke="{DynamicResource AvalonDock_Expression_BaseColor8}" />
+												<avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}" DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}" />
+											</Grid>
+										</Grid>
+										<ContentPresenter
+											Grid.Row="1"
+											Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
+											FlowDirection="{TemplateBinding FlowDirection}" />
+
+
+										<!--<ContentPresenter
                                             Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}"
                                             ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                             ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
                                             Grid.Row="1"/>-->
 
-                                    </Grid>
-                                </Border>
-                                <ControlTemplate.Triggers>
-                                    <Trigger SourceName="MenuDropDownButton" Property="IsMouseOver" Value="True">
-                                        <Setter TargetName="PART_ImgMenuPin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinMenu_Light.png" />
-                                    </Trigger>
-                                    <Trigger SourceName="MenuDropDownButton" Property="IsChecked" Value="True">
-                                        <Setter TargetName="PART_ImgMenuPin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinMenu_Light.png" />
-                                    </Trigger>
-                                    <Trigger SourceName="PART_AutoHidePin" Property="IsMouseOver" Value="True">
-                                        <Setter TargetName="PART_ImgAutoHidePin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinAutoHide_Light.png" />
-                                    </Trigger>
-                                    <Trigger SourceName="PART_HidePin" Property="IsMouseOver" Value="True">
-                                        <Setter TargetName="PART_ImgHidePin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinClose_Light.png" />
-                                    </Trigger>
-
-                                    <Trigger Property="IsEnabled" Value="false">
-                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                                    </Trigger>
-
-                                </ControlTemplate.Triggers>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-
-    <Style x:Key="AvalonDock_Expression_NavigatorWindowListBoxItemFocusVisual">
-        <Setter Property="Control.Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Rectangle
-                        RadiusX="2"
-                        RadiusY="2"
-                        Stroke="#8E6EA6F5"
-                        StrokeThickness="1" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-
-    <Style x:Key="AvalonDock_Expression_NavigatorWindowListBoxItemStyle" TargetType="ListBoxItem">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource AvalonDock_Expression_NavigatorWindowListBoxItemFocusVisual}" />
-        <Setter Property="Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor2}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Padding" Value="5,0,5,0" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListBoxItem">
-                    <Border
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="0"
-                        SnapsToDevicePixels="true">
-                        <Border
-                            x:Name="InnerBorder"
-                            BorderThickness="0"
-                            CornerRadius="1">
-                            <ContentPresenter
-                                Grid.RowSpan="2"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </Border>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_NavigatorWindowListBoxItemHoverFill}" />
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="true">
-                            <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_NavigatorWindowListBoxItemSelectedFill}" />
-                            <Setter Property="Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor3}" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="{x:Type avalonDockControls:NavigatorWindow}" TargetType="{x:Type avalonDockControls:NavigatorWindow}">
-        <Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor13}" />
-        <Setter Property="Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor2}" />
-        <Setter Property="SizeToContent" Value="WidthAndHeight" />
-        <Setter Property="ResizeMode" Value="NoResize" />
-        <Setter Property="shell:WindowChrome.WindowChrome">
-            <Setter.Value>
-                <shell:WindowChrome
-                    CaptionHeight="16"
-                    CornerRadius="0"
-                    GlassFrameThickness="4"
-                    ResizeBorderThickness="10" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
-                    <Grid>
-                        <Border
-                            x:Name="WindowBorder"
-                            Background="{DynamicResource AvalonDock_Expression_BaseColor13}"
-                            BorderBrush="{DynamicResource AvalonDock_Expression_BaseColor10}"
-                            BorderThickness="1"
-                            CornerRadius="0">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="54" />
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-
-                                <Grid Margin="5">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                    </Grid.RowDefinitions>
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition />
-                                        </Grid.ColumnDefinitions>
-                                        <Image
-                                            Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}"
-                                            Stretch="None"
-                                            Visibility="{Binding SelectedDocument.LayoutElement.IconSource, Converter={avalonDockConverters:BoolToVisibilityConverter}}" />
-                                        <TextBlock
-                                            x:Name="selectedElementTitle"
-                                            Grid.Column="1"
-                                            Margin="4,0,0,0"
-                                            VerticalAlignment="Center"
-                                            FontWeight="Bold"
-                                            Text="{Binding SelectedDocument.LayoutElement.Title}"
-                                            TextTrimming="CharacterEllipsis" />
-                                    </Grid>
-                                    <TextBlock
-                                        x:Name="selectedElementDescription"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding SelectedDocument.LayoutElement.Description}"
-                                        TextTrimming="CharacterEllipsis" />
-                                </Grid>
-
-                                <Border
-                                    Grid.Row="1"
-                                    MinHeight="200"
-                                    Background="{DynamicResource AvalonDock_Expression_BaseColor4}"
-                                    BorderBrush="{DynamicResource AvalonDock_Expression_BaseColor4}"
-                                    BorderThickness="1">
-                                    <Grid Margin="5">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition />
-                                        </Grid.ColumnDefinitions>
-                                        <Grid Margin="5">
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition />
-                                            </Grid.RowDefinitions>
-                                            <TextBlock
-                                                Margin="0,3,0,4"
-                                                FontWeight="Bold"
-                                                Text="Active Tool Windows" />
-                                            <ListBox
-                                                x:Name="PART_AnchorableListBox"
-                                                Grid.Row="1"
-                                                MaxHeight="400"
-                                                Background="Transparent"
-                                                BorderThickness="0"
-                                                ItemContainerStyle="{StaticResource AvalonDock_Expression_NavigatorWindowListBoxItemStyle}"
-                                                ItemsSource="{Binding Anchorables}"
-                                                SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}">
-                                                <ListBox.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Grid Margin="0,2,0,2">
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="16" />
-                                                                <ColumnDefinition Width="150" />
-                                                            </Grid.ColumnDefinitions>
-                                                            <Image Source="{Binding LayoutElement.IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}" Stretch="None" />
-                                                            <TextBlock
-                                                                Grid.Column="1"
-                                                                Margin="4,0,0,0"
-                                                                Text="{Binding LayoutElement.Title}"
-                                                                TextTrimming="CharacterEllipsis" />
-                                                        </Grid>
-                                                    </DataTemplate>
-                                                </ListBox.ItemTemplate>
-                                            </ListBox>
-                                        </Grid>
-                                        <Grid Grid.Column="1" Margin="5">
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition />
-                                            </Grid.RowDefinitions>
-                                            <TextBlock
-                                                Margin="0,3,0,4"
-                                                FontWeight="Bold"
-                                                Text="Active Files" />
-                                            <ListBox
-                                                x:Name="PART_DocumentListBox"
-                                                Grid.Row="1"
-                                                MaxHeight="400"
-                                                Background="Transparent"
-                                                BorderThickness="0"
-                                                ItemContainerStyle="{StaticResource AvalonDock_Expression_NavigatorWindowListBoxItemStyle}"
-                                                ItemsSource="{Binding Documents}"
-                                                SelectedItem="{Binding SelectedDocument, Mode=TwoWay}">
-                                                <ListBox.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Grid Margin="0,2,0,2">
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="16" />
-                                                                <ColumnDefinition Width="150" />
-                                                            </Grid.ColumnDefinitions>
-                                                            <Image Source="{Binding LayoutElement.IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}" Stretch="None" />
-                                                            <TextBlock
-                                                                Grid.Column="1"
-                                                                Margin="4,0,0,0"
-                                                                Text="{Binding LayoutElement.Title}"
-                                                                TextTrimming="CharacterEllipsis" />
-                                                        </Grid>
-                                                    </DataTemplate>
-                                                </ListBox.ItemTemplate>
-                                                <ListBox.ItemsPanel>
-                                                    <ItemsPanelTemplate>
-                                                        <WrapPanel Orientation="Vertical" />
-                                                    </ItemsPanelTemplate>
-                                                </ListBox.ItemsPanel>
-                                            </ListBox>
-                                        </Grid>
-                                    </Grid>
-                                </Border>
-
-                                <Grid Grid.Row="2" Margin="5">
-                                    <TextBlock VerticalAlignment="Center" Text="{Binding SelectedDocument.LayoutElement.ToolTip}" />
-                                </Grid>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="SelectedDocument" Value="{x:Null}">
-                            <Setter TargetName="selectedElementTitle" Property="Text" Value="{Binding SelectedAnchorable.LayoutElement.Title}" />
-                            <Setter TargetName="selectedElementDescription" Property="Text" Value="{x:Null}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--
-        Re-styling this in AvalonDock since the menu on the drop-down button for more documents is otherwise black
-        BugFix for Issue http://avalondock.codeplex.com/workitem/15743
-    -->
-    <Style BasedOn="{StaticResource {x:Type ContextMenu}}" TargetType="{x:Type avalonDockControls:ContextMenuEx}" />
+									</Grid>
+								</Border>
+								<ControlTemplate.Triggers>
+									<Trigger SourceName="MenuDropDownButton" Property="IsMouseOver" Value="True">
+										<Setter TargetName="PART_ImgMenuPin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinMenu_Light.png" />
+									</Trigger>
+									<Trigger SourceName="MenuDropDownButton" Property="IsChecked" Value="True">
+										<Setter TargetName="PART_ImgMenuPin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinMenu_Light.png" />
+									</Trigger>
+									<Trigger SourceName="PART_AutoHidePin" Property="IsMouseOver" Value="True">
+										<Setter TargetName="PART_ImgAutoHidePin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinAutoHide_Light.png" />
+									</Trigger>
+									<Trigger SourceName="PART_HidePin" Property="IsMouseOver" Value="True">
+										<Setter TargetName="PART_ImgHidePin" Property="Source" Value="/AvalonDock.Themes.Expression;component/Images/PinClose_Light.png" />
+									</Trigger>
+
+									<Trigger Property="IsEnabled" Value="false">
+										<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+									</Trigger>
+
+								</ControlTemplate.Triggers>
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+
+	<Style x:Key="AvalonDock_Expression_NavigatorWindowListBoxItemFocusVisual">
+		<Setter Property="Control.Template">
+			<Setter.Value>
+				<ControlTemplate>
+					<Rectangle
+						RadiusX="2"
+						RadiusY="2"
+						Stroke="#8E6EA6F5"
+						StrokeThickness="1" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+
+	<Style x:Key="AvalonDock_Expression_NavigatorWindowListBoxItemStyle" TargetType="ListBoxItem">
+		<Setter Property="FocusVisualStyle" Value="{StaticResource AvalonDock_Expression_NavigatorWindowListBoxItemFocusVisual}" />
+		<Setter Property="Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor2}" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Padding" Value="5,0,5,0" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Cursor" Value="Hand" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ListBoxItem">
+					<Border
+						Background="{TemplateBinding Background}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}"
+						CornerRadius="0"
+						SnapsToDevicePixels="true">
+						<Border
+							x:Name="InnerBorder"
+							BorderThickness="0"
+							CornerRadius="1">
+							<ContentPresenter
+								Grid.RowSpan="2"
+								VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+								SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</Border>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_NavigatorWindowListBoxItemHoverFill}" />
+						</Trigger>
+						<Trigger Property="IsSelected" Value="true">
+							<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_NavigatorWindowListBoxItemSelectedFill}" />
+							<Setter Property="Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor3}" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style x:Key="{x:Type avalonDockControls:NavigatorWindow}" TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+		<Setter Property="Background" Value="{DynamicResource AvalonDock_Expression_BaseColor13}" />
+		<Setter Property="Foreground" Value="{DynamicResource AvalonDock_Expression_BaseColor2}" />
+		<Setter Property="SizeToContent" Value="WidthAndHeight" />
+		<Setter Property="ResizeMode" Value="NoResize" />
+		<Setter Property="shell:WindowChrome.WindowChrome">
+			<Setter.Value>
+				<shell:WindowChrome
+					CaptionHeight="16"
+					CornerRadius="0"
+					GlassFrameThickness="4"
+					ResizeBorderThickness="10" />
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+					<Grid>
+						<Border
+							x:Name="WindowBorder"
+							Background="{DynamicResource AvalonDock_Expression_BaseColor13}"
+							BorderBrush="{DynamicResource AvalonDock_Expression_BaseColor10}"
+							BorderThickness="1"
+							CornerRadius="0">
+							<Grid>
+								<Grid.RowDefinitions>
+									<RowDefinition Height="54" />
+									<RowDefinition Height="*" />
+									<RowDefinition Height="Auto" />
+								</Grid.RowDefinitions>
+
+								<Grid Margin="5">
+									<Grid.RowDefinitions>
+										<RowDefinition />
+										<RowDefinition />
+									</Grid.RowDefinitions>
+									<Grid>
+										<Grid.ColumnDefinitions>
+											<ColumnDefinition Width="Auto" />
+											<ColumnDefinition />
+										</Grid.ColumnDefinitions>
+										<Image
+											Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}"
+											Stretch="None"
+											Visibility="{Binding SelectedDocument.LayoutElement.IconSource, Converter={avalonDockConverters:BoolToVisibilityConverter}}" />
+										<TextBlock
+											x:Name="selectedElementTitle"
+											Grid.Column="1"
+											Margin="4,0,0,0"
+											VerticalAlignment="Center"
+											FontWeight="Bold"
+											Text="{Binding SelectedDocument.LayoutElement.Title}"
+											TextTrimming="CharacterEllipsis" />
+									</Grid>
+									<TextBlock
+										x:Name="selectedElementDescription"
+										VerticalAlignment="Center"
+										Text="{Binding SelectedDocument.LayoutElement.Description}"
+										TextTrimming="CharacterEllipsis" />
+								</Grid>
+
+								<Border
+									Grid.Row="1"
+									MinHeight="200"
+									Background="{DynamicResource AvalonDock_Expression_BaseColor4}"
+									BorderBrush="{DynamicResource AvalonDock_Expression_BaseColor4}"
+									BorderThickness="1">
+									<Grid Margin="5">
+										<Grid.ColumnDefinitions>
+											<ColumnDefinition Width="Auto" />
+											<ColumnDefinition />
+										</Grid.ColumnDefinitions>
+										<Grid Margin="5">
+											<Grid.RowDefinitions>
+												<RowDefinition Height="Auto" />
+												<RowDefinition />
+											</Grid.RowDefinitions>
+											<TextBlock
+												Margin="0,3,0,4"
+												FontWeight="Bold"
+												Text="Active Tool Windows" />
+											<ListBox
+												x:Name="PART_AnchorableListBox"
+												Grid.Row="1"
+												MaxHeight="400"
+												Background="Transparent"
+												BorderThickness="0"
+												ItemContainerStyle="{StaticResource AvalonDock_Expression_NavigatorWindowListBoxItemStyle}"
+												ItemsSource="{Binding Anchorables}"
+												SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}">
+												<ListBox.ItemTemplate>
+													<DataTemplate>
+														<Grid Margin="0,2,0,2">
+															<Grid.ColumnDefinitions>
+																<ColumnDefinition Width="16" />
+																<ColumnDefinition Width="150" />
+															</Grid.ColumnDefinitions>
+															<Image Source="{Binding LayoutElement.IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}" Stretch="None" />
+															<TextBlock
+																Grid.Column="1"
+																Margin="4,0,0,0"
+																Text="{Binding LayoutElement.Title}"
+																TextTrimming="CharacterEllipsis" />
+														</Grid>
+													</DataTemplate>
+												</ListBox.ItemTemplate>
+											</ListBox>
+										</Grid>
+										<Grid Grid.Column="1" Margin="5">
+											<Grid.RowDefinitions>
+												<RowDefinition Height="Auto" />
+												<RowDefinition />
+											</Grid.RowDefinitions>
+											<TextBlock
+												Margin="0,3,0,4"
+												FontWeight="Bold"
+												Text="Active Files" />
+											<ListBox
+												x:Name="PART_DocumentListBox"
+												Grid.Row="1"
+												MaxHeight="400"
+												Background="Transparent"
+												BorderThickness="0"
+												ItemContainerStyle="{StaticResource AvalonDock_Expression_NavigatorWindowListBoxItemStyle}"
+												ItemsSource="{Binding Documents}"
+												SelectedItem="{Binding SelectedDocument, Mode=TwoWay}">
+												<ListBox.ItemTemplate>
+													<DataTemplate>
+														<Grid Margin="0,2,0,2">
+															<Grid.ColumnDefinitions>
+																<ColumnDefinition Width="16" />
+																<ColumnDefinition Width="150" />
+															</Grid.ColumnDefinitions>
+															<Image Source="{Binding LayoutElement.IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}" Stretch="None" />
+															<TextBlock
+																Grid.Column="1"
+																Margin="4,0,0,0"
+																Text="{Binding LayoutElement.Title}"
+																TextTrimming="CharacterEllipsis" />
+														</Grid>
+													</DataTemplate>
+												</ListBox.ItemTemplate>
+												<ListBox.ItemsPanel>
+													<ItemsPanelTemplate>
+														<WrapPanel Orientation="Vertical" />
+													</ItemsPanelTemplate>
+												</ListBox.ItemsPanel>
+											</ListBox>
+										</Grid>
+									</Grid>
+								</Border>
+
+								<Grid Grid.Row="2" Margin="5">
+									<TextBlock VerticalAlignment="Center" Text="{Binding SelectedDocument.LayoutElement.ToolTip}" />
+								</Grid>
+							</Grid>
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="SelectedDocument" Value="{x:Null}">
+							<Setter TargetName="selectedElementTitle" Property="Text" Value="{Binding SelectedAnchorable.LayoutElement.Title}" />
+							<Setter TargetName="selectedElementDescription" Property="Text" Value="{x:Null}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<!--
+		Re-styling this in AvalonDock since the menu on the drop-down button for more documents is otherwise black
+		BugFix for Issue http://avalondock.codeplex.com/workitem/15743
+	-->
+	<Style BasedOn="{StaticResource {x:Type ContextMenu}}" TargetType="{x:Type avalonDockControls:ContextMenuEx}" />
 
 </ResourceDictionary>
diff --git a/source/Components/AvalonDock/Controls/AnchorablePaneDropTarget.cs b/source/Components/AvalonDock/Controls/AnchorablePaneDropTarget.cs
index 3ed7a42b..72a688b1 100644
--- a/source/Components/AvalonDock/Controls/AnchorablePaneDropTarget.cs
+++ b/source/Components/AvalonDock/Controls/AnchorablePaneDropTarget.cs
@@ -7,10 +7,10 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -21,11 +21,14 @@ namespace AvalonDock.Controls
 	internal class AnchorablePaneDropTarget : DropTarget<LayoutAnchorablePaneControl>
 	{
 		#region fields
+
 		private LayoutAnchorablePaneControl _targetPane;
 		private int _tabIndex = -1;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>
 		/// Class constructor from parameters without a specific tabindex as dock position.
 		/// </summary>
@@ -57,9 +60,11 @@ internal AnchorablePaneDropTarget(LayoutAnchorablePaneControl paneControl,
 			_targetPane = paneControl;
 			_tabIndex = tabIndex;
 		}
+
 		#endregion Constructors
 
 		#region Overrides
+
 		/// <summary>
 		/// Method is invoked to complete a drag & drop operation with a (new) docking position
 		/// by docking of the <paramref name="floatingWindow"/> into this drop target.
@@ -73,200 +78,210 @@ protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
 			switch (Type)
 			{
 				case DropTargetType.AnchorablePaneDockBottom:
-				#region DropTargetType.AnchorablePaneDockBottom
-				{
-					var parentModel = targetModel.Parent as ILayoutGroup;
-					var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
-					int insertToIndex = parentModel.IndexOfChild(targetModel);
 
-					if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Vertical &&
-						parentModel.ChildrenCount == 1)
-						parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Vertical;
+					#region DropTargetType.AnchorablePaneDockBottom
 
-					if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Vertical)
 					{
-						var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
-						if (layoutAnchorablePaneGroup != null &&
-							(layoutAnchorablePaneGroup.Children.Count == 1 ||
-								layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical))
+						var parentModel = targetModel.Parent as ILayoutGroup;
+						var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
+						int insertToIndex = parentModel.IndexOfChild(targetModel);
+
+						if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Vertical &&
+							parentModel.ChildrenCount == 1)
+							parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+						if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Vertical)
 						{
-							var anchorablesToMove = layoutAnchorablePaneGroup.Children.ToArray();
-							for (int i = 0; i < anchorablesToMove.Length; i++)
-								parentModel.InsertChildAt(insertToIndex + 1 + i, anchorablesToMove[i]);
+							var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+							if (layoutAnchorablePaneGroup != null &&
+								(layoutAnchorablePaneGroup.Children.Count == 1 ||
+									layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical))
+							{
+								var anchorablesToMove = layoutAnchorablePaneGroup.Children.ToArray();
+								for (int i = 0; i < anchorablesToMove.Length; i++)
+									parentModel.InsertChildAt(insertToIndex + 1 + i, anchorablesToMove[i]);
+							}
+							else
+								parentModel.InsertChildAt(insertToIndex + 1, floatingWindow.RootPanel);
 						}
 						else
-							parentModel.InsertChildAt(insertToIndex + 1, floatingWindow.RootPanel);
-					}
-					else
-					{
-						var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
-						var newOrientedPanel = new LayoutAnchorablePaneGroup()
 						{
-							Orientation = System.Windows.Controls.Orientation.Vertical,
-							DockWidth = targetModelAsPositionableElement.DockWidth,
-							DockHeight = targetModelAsPositionableElement.DockHeight,
-						};
-
-						parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
-						newOrientedPanel.Children.Add(targetModel);
-						newOrientedPanel.Children.Add(floatingWindow.RootPanel);
-
+							var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
+							var newOrientedPanel = new LayoutAnchorablePaneGroup()
+							{
+								Orientation = System.Windows.Controls.Orientation.Vertical,
+								DockWidth = targetModelAsPositionableElement.DockWidth,
+								DockHeight = targetModelAsPositionableElement.DockHeight,
+							};
+
+							parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
+							newOrientedPanel.Children.Add(targetModel);
+							newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+						}
 					}
-				}
-				break;
+					break;
+
 				#endregion DropTargetType.AnchorablePaneDockBottom
 
 				case DropTargetType.AnchorablePaneDockTop:
-				#region DropTargetType.AnchorablePaneDockTop
-				{
-					var parentModel = targetModel.Parent as ILayoutGroup;
-					var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
-					int insertToIndex = parentModel.IndexOfChild(targetModel);
 
-					if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Vertical &&
-						parentModel.ChildrenCount == 1)
-						parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Vertical;
+					#region DropTargetType.AnchorablePaneDockTop
 
-					if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Vertical)
 					{
-						var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
-						if (layoutAnchorablePaneGroup != null &&
-							(layoutAnchorablePaneGroup.Children.Count == 1 ||
-								layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical))
+						var parentModel = targetModel.Parent as ILayoutGroup;
+						var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
+						int insertToIndex = parentModel.IndexOfChild(targetModel);
+
+						if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Vertical &&
+							parentModel.ChildrenCount == 1)
+							parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+						if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Vertical)
 						{
-							var anchorablesToMove = layoutAnchorablePaneGroup.Children.ToArray();
-							for (int i = 0; i < anchorablesToMove.Length; i++)
-								parentModel.InsertChildAt(insertToIndex + i, anchorablesToMove[i]);
+							var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+							if (layoutAnchorablePaneGroup != null &&
+								(layoutAnchorablePaneGroup.Children.Count == 1 ||
+									layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical))
+							{
+								var anchorablesToMove = layoutAnchorablePaneGroup.Children.ToArray();
+								for (int i = 0; i < anchorablesToMove.Length; i++)
+									parentModel.InsertChildAt(insertToIndex + i, anchorablesToMove[i]);
+							}
+							else
+								parentModel.InsertChildAt(insertToIndex, floatingWindow.RootPanel);
 						}
 						else
-							parentModel.InsertChildAt(insertToIndex, floatingWindow.RootPanel);
-					}
-					else
-					{
-						var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
-						var newOrientedPanel = new LayoutAnchorablePaneGroup()
 						{
-							Orientation = System.Windows.Controls.Orientation.Vertical,
-							DockWidth = targetModelAsPositionableElement.DockWidth,
-							DockHeight = targetModelAsPositionableElement.DockHeight,
-						};
-
-						parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
-						//the floating window must be added after the target modal as it could be raise a CollectGarbage call
-						newOrientedPanel.Children.Add(targetModel);
-						newOrientedPanel.Children.Insert(0, floatingWindow.RootPanel);
-
+							var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
+							var newOrientedPanel = new LayoutAnchorablePaneGroup()
+							{
+								Orientation = System.Windows.Controls.Orientation.Vertical,
+								DockWidth = targetModelAsPositionableElement.DockWidth,
+								DockHeight = targetModelAsPositionableElement.DockHeight,
+							};
+
+							parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
+							//the floating window must be added after the target modal as it could be raise a CollectGarbage call
+							newOrientedPanel.Children.Add(targetModel);
+							newOrientedPanel.Children.Insert(0, floatingWindow.RootPanel);
+						}
 					}
-				}
-				break;
+					break;
+
 				#endregion DropTargetType.AnchorablePaneDockTop
 
 				case DropTargetType.AnchorablePaneDockLeft:
-				#region DropTargetType.AnchorablePaneDockLeft
-				{
-					var parentModel = targetModel.Parent as ILayoutGroup;
-					var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
-					int insertToIndex = parentModel.IndexOfChild(targetModel);
 
-					if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Horizontal &&
-						parentModel.ChildrenCount == 1)
-						parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Horizontal;
+					#region DropTargetType.AnchorablePaneDockLeft
 
-					if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Horizontal)
 					{
-						var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
-						if (layoutAnchorablePaneGroup != null &&
-							(layoutAnchorablePaneGroup.Children.Count == 1 ||
-								layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal))
+						var parentModel = targetModel.Parent as ILayoutGroup;
+						var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
+						int insertToIndex = parentModel.IndexOfChild(targetModel);
+
+						if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Horizontal &&
+							parentModel.ChildrenCount == 1)
+							parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+						if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Horizontal)
 						{
-							var anchorablesToMove = layoutAnchorablePaneGroup.Children.ToArray();
-							for (int i = 0; i < anchorablesToMove.Length; i++)
-								parentModel.InsertChildAt(insertToIndex + i, anchorablesToMove[i]);
+							var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+							if (layoutAnchorablePaneGroup != null &&
+								(layoutAnchorablePaneGroup.Children.Count == 1 ||
+									layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal))
+							{
+								var anchorablesToMove = layoutAnchorablePaneGroup.Children.ToArray();
+								for (int i = 0; i < anchorablesToMove.Length; i++)
+									parentModel.InsertChildAt(insertToIndex + i, anchorablesToMove[i]);
+							}
+							else
+								parentModel.InsertChildAt(insertToIndex, floatingWindow.RootPanel);
 						}
 						else
-							parentModel.InsertChildAt(insertToIndex, floatingWindow.RootPanel);
-					}
-					else
-					{
-						var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
-						var newOrientedPanel = new LayoutAnchorablePaneGroup()
 						{
-							Orientation = System.Windows.Controls.Orientation.Horizontal,
-							DockWidth = targetModelAsPositionableElement.DockWidth,
-							DockHeight = targetModelAsPositionableElement.DockHeight,
-						};
-
-						parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
-						//the floating window must be added after the target modal as it could be raise a CollectGarbage call
-						newOrientedPanel.Children.Add(targetModel);
-						newOrientedPanel.Children.Insert(0, floatingWindow.RootPanel);
-
+							var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
+							var newOrientedPanel = new LayoutAnchorablePaneGroup()
+							{
+								Orientation = System.Windows.Controls.Orientation.Horizontal,
+								DockWidth = targetModelAsPositionableElement.DockWidth,
+								DockHeight = targetModelAsPositionableElement.DockHeight,
+							};
+
+							parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
+							//the floating window must be added after the target modal as it could be raise a CollectGarbage call
+							newOrientedPanel.Children.Add(targetModel);
+							newOrientedPanel.Children.Insert(0, floatingWindow.RootPanel);
+						}
 					}
-				}
-				break;
+					break;
+
 				#endregion DropTargetType.AnchorablePaneDockLeft
 
 				case DropTargetType.AnchorablePaneDockRight:
-				#region DropTargetType.AnchorablePaneDockRight
-				{
-					var parentModel = targetModel.Parent as ILayoutGroup;
-					var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
-					int insertToIndex = parentModel.IndexOfChild(targetModel);
 
-					if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Horizontal &&
-						parentModel.ChildrenCount == 1)
-						parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Horizontal;
+					#region DropTargetType.AnchorablePaneDockRight
 
-					if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Horizontal)
 					{
-						var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
-						if (layoutAnchorablePaneGroup != null &&
-							(layoutAnchorablePaneGroup.Children.Count == 1 ||
-								layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal))
+						var parentModel = targetModel.Parent as ILayoutGroup;
+						var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
+						int insertToIndex = parentModel.IndexOfChild(targetModel);
+
+						if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Horizontal &&
+							parentModel.ChildrenCount == 1)
+							parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+						if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Horizontal)
 						{
-							var anchorablesToMove = layoutAnchorablePaneGroup.Children.ToArray();
-							for (int i = 0; i < anchorablesToMove.Length; i++)
-								parentModel.InsertChildAt(insertToIndex + 1 + i, anchorablesToMove[i]);
+							var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+							if (layoutAnchorablePaneGroup != null &&
+								(layoutAnchorablePaneGroup.Children.Count == 1 ||
+									layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal))
+							{
+								var anchorablesToMove = layoutAnchorablePaneGroup.Children.ToArray();
+								for (int i = 0; i < anchorablesToMove.Length; i++)
+									parentModel.InsertChildAt(insertToIndex + 1 + i, anchorablesToMove[i]);
+							}
+							else
+								parentModel.InsertChildAt(insertToIndex + 1, floatingWindow.RootPanel);
 						}
 						else
-							parentModel.InsertChildAt(insertToIndex + 1, floatingWindow.RootPanel);
-					}
-					else
-					{
-						var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
-						var newOrientedPanel = new LayoutAnchorablePaneGroup()
 						{
-							Orientation = System.Windows.Controls.Orientation.Horizontal,
-							DockWidth = targetModelAsPositionableElement.DockWidth,
-							DockHeight = targetModelAsPositionableElement.DockHeight,
-						};
-
-						parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
-						newOrientedPanel.Children.Add(targetModel);
-						newOrientedPanel.Children.Add(floatingWindow.RootPanel);
-
+							var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
+							var newOrientedPanel = new LayoutAnchorablePaneGroup()
+							{
+								Orientation = System.Windows.Controls.Orientation.Horizontal,
+								DockWidth = targetModelAsPositionableElement.DockWidth,
+								DockHeight = targetModelAsPositionableElement.DockHeight,
+							};
+
+							parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
+							newOrientedPanel.Children.Add(targetModel);
+							newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+						}
 					}
-				}
-				break;
+					break;
+
 				#endregion DropTargetType.AnchorablePaneDockRight
 
 				case DropTargetType.AnchorablePaneDockInside:
-				#region DropTargetType.AnchorablePaneDockInside
-				{
-					var paneModel = targetModel as LayoutAnchorablePane;
-					var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
-
-					int i = _tabIndex == -1 ? 0 : _tabIndex;
-					foreach (var anchorableToImport in
-						layoutAnchorablePaneGroup.Descendents().OfType<LayoutAnchorable>().ToArray())
+
+					#region DropTargetType.AnchorablePaneDockInside
+
 					{
-						paneModel.Children.Insert(i, anchorableToImport);
-						i++;
+						var paneModel = targetModel as LayoutAnchorablePane;
+						var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+
+						int i = _tabIndex == -1 ? 0 : _tabIndex;
+						foreach (var anchorableToImport in
+							layoutAnchorablePaneGroup.Descendents().OfType<LayoutAnchorable>().ToArray())
+						{
+							paneModel.Children.Insert(i, anchorableToImport);
+							i++;
+						}
 					}
+					break;
 
-				}
-				break;
-				#endregion DropTargetType.AnchorablePaneDockInside
+					#endregion DropTargetType.AnchorablePaneDockInside
 			}
 
 			anchorableActive.IsActive = true;
@@ -283,80 +298,80 @@ protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
 		/// <param name="floatingWindowModel"></param>
 		/// <returns>The geometry of the preview/highlighting WPF figure path.</returns>
 		public override Geometry GetPreviewPath(OverlayWindow overlayWindow,
-			                                    LayoutFloatingWindow floatingWindowModel)
+												LayoutFloatingWindow floatingWindowModel)
 		{
 			switch (Type)
 			{
 				case DropTargetType.AnchorablePaneDockBottom:
-				{
-					var targetScreenRect = TargetElement.GetScreenArea();
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+					{
+						var targetScreenRect = TargetElement.GetScreenArea();
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
 
-					targetScreenRect.Offset(0.0, targetScreenRect.Height / 2.0);
-					targetScreenRect.Height /= 2.0;
+						targetScreenRect.Offset(0.0, targetScreenRect.Height / 2.0);
+						targetScreenRect.Height /= 2.0;
 
-					return new RectangleGeometry(targetScreenRect);
-				}
+						return new RectangleGeometry(targetScreenRect);
+					}
 
 				case DropTargetType.AnchorablePaneDockTop:
-				{
-					var targetScreenRect = TargetElement.GetScreenArea();
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+					{
+						var targetScreenRect = TargetElement.GetScreenArea();
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
 
-					targetScreenRect.Height /= 2.0;
+						targetScreenRect.Height /= 2.0;
 
-					return new RectangleGeometry(targetScreenRect);
-				}
+						return new RectangleGeometry(targetScreenRect);
+					}
 
 				case DropTargetType.AnchorablePaneDockLeft:
-				{
-					var targetScreenRect = TargetElement.GetScreenArea();
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+					{
+						var targetScreenRect = TargetElement.GetScreenArea();
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
 
-					targetScreenRect.Width /= 2.0;
+						targetScreenRect.Width /= 2.0;
 
-					return new RectangleGeometry(targetScreenRect);
-				}
+						return new RectangleGeometry(targetScreenRect);
+					}
 
 				case DropTargetType.AnchorablePaneDockRight:
-				{
-					var targetScreenRect = TargetElement.GetScreenArea();
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+					{
+						var targetScreenRect = TargetElement.GetScreenArea();
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
 
-					targetScreenRect.Offset(targetScreenRect.Width / 2.0, 0.0);
-					targetScreenRect.Width /= 2.0;
+						targetScreenRect.Offset(targetScreenRect.Width / 2.0, 0.0);
+						targetScreenRect.Width /= 2.0;
 
-					return new RectangleGeometry(targetScreenRect);
-				}
+						return new RectangleGeometry(targetScreenRect);
+					}
 
 				case DropTargetType.AnchorablePaneDockInside:
-				{
-					var targetScreenRect = TargetElement.GetScreenArea();
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-
-					if (_tabIndex == -1)
-						return new RectangleGeometry(targetScreenRect);
-					else
 					{
-						var translatedDetectionRect = new Rect(DetectionRects[0].TopLeft, DetectionRects[0].BottomRight);
-						translatedDetectionRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-
-						var pathFigure = new PathFigure();
-						pathFigure.StartPoint = targetScreenRect.TopLeft;
-						pathFigure.Segments.Add(new LineSegment() { Point = new Point(targetScreenRect.Left, translatedDetectionRect.Top) });
-						pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.TopLeft });
-						pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.BottomLeft });
-						pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.BottomRight });
-						pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.TopRight });
-						pathFigure.Segments.Add(new LineSegment() { Point = new Point(targetScreenRect.Right, translatedDetectionRect.Top) });
-						pathFigure.Segments.Add(new LineSegment() { Point = targetScreenRect.TopRight });
-						pathFigure.IsClosed = true;
-						pathFigure.IsFilled = true;
-						pathFigure.Freeze();
-
-						return new PathGeometry(new PathFigure[] { pathFigure });
+						var targetScreenRect = TargetElement.GetScreenArea();
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+						if (_tabIndex == -1)
+							return new RectangleGeometry(targetScreenRect);
+						else
+						{
+							var translatedDetectionRect = new Rect(DetectionRects[0].TopLeft, DetectionRects[0].BottomRight);
+							translatedDetectionRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+							var pathFigure = new PathFigure();
+							pathFigure.StartPoint = targetScreenRect.TopLeft;
+							pathFigure.Segments.Add(new LineSegment() { Point = new Point(targetScreenRect.Left, translatedDetectionRect.Top) });
+							pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.TopLeft });
+							pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.BottomLeft });
+							pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.BottomRight });
+							pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.TopRight });
+							pathFigure.Segments.Add(new LineSegment() { Point = new Point(targetScreenRect.Right, translatedDetectionRect.Top) });
+							pathFigure.Segments.Add(new LineSegment() { Point = targetScreenRect.TopRight });
+							pathFigure.IsClosed = true;
+							pathFigure.IsFilled = true;
+							pathFigure.Freeze();
+
+							return new PathGeometry(new PathFigure[] { pathFigure });
+						}
 					}
-				}
 			}
 
 			return null;
@@ -364,4 +379,4 @@ public override Geometry GetPreviewPath(OverlayWindow overlayWindow,
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/AnchorablePaneTabPanel.cs b/source/Components/AvalonDock/Controls/AnchorablePaneTabPanel.cs
index 3de6df3d..bc62934a 100644
--- a/source/Components/AvalonDock/Controls/AnchorablePaneTabPanel.cs
+++ b/source/Components/AvalonDock/Controls/AnchorablePaneTabPanel.cs
@@ -7,16 +7,16 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
-using AvalonDock.Layout;
+using System.Windows.Controls;
 
 namespace AvalonDock.Controls
 {
 	/// <summary>
-	/// provides a <see cref="Panel"/> that contains the TabItem Headers of the <see cref="LayoutAnchorablePaneControl"/>. 
+	/// provides a <see cref="Panel"/> that contains the TabItem Headers of the <see cref="LayoutAnchorablePaneControl"/>.
 	/// </summary>
 	public class AnchorablePaneTabPanel : Panel
 	{
@@ -59,7 +59,6 @@ protected override Size ArrangeOverride(Size finalSize)
 		{
 			var visibleChildren = Children.Cast<UIElement>().Where(ch => ch.Visibility != System.Windows.Visibility.Collapsed);
 
-
 			double finalWidth = finalSize.Width;
 			double desideredWidth = visibleChildren.Sum(ch => ch.DesiredSize.Width);
 			double offsetX = 0.0;
@@ -105,4 +104,4 @@ protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/AnchorablePaneTitle.cs b/source/Components/AvalonDock/Controls/AnchorablePaneTitle.cs
index 36e73117..fb294124 100644
--- a/source/Components/AvalonDock/Controls/AnchorablePaneTitle.cs
+++ b/source/Components/AvalonDock/Controls/AnchorablePaneTitle.cs
@@ -7,11 +7,11 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -23,10 +23,13 @@ namespace AvalonDock.Controls
 	public class AnchorablePaneTitle : Control
 	{
 		#region fields
+
 		private bool _isMouseDown = false;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>
 		/// Static class constructor
 		/// </summary>
@@ -122,7 +125,7 @@ protected override void OnMouseLeave(MouseEventArgs e)
 		protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
 		{
 			base.OnMouseLeftButtonDown(e);
-			
+
 			// Start a drag & drop action for a LayoutAnchorable
 			if (e.Handled || Model.CanMove == false) return;
 			var attachFloatingWindow = false;
@@ -149,4 +152,4 @@ protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/AutoHideWindowManager.cs b/source/Components/AvalonDock/Controls/AutoHideWindowManager.cs
index e26042dd..fcddada0 100644
--- a/source/Components/AvalonDock/Controls/AutoHideWindowManager.cs
+++ b/source/Components/AvalonDock/Controls/AutoHideWindowManager.cs
@@ -7,9 +7,9 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Windows.Threading;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -22,12 +22,15 @@ namespace AvalonDock.Controls
 	internal class AutoHideWindowManager
 	{
 		#region fields
+
 		private DockingManager _manager;
 		private WeakReference _currentAutohiddenAnchor = null;
 		private DispatcherTimer _closeTimer = null;
+
 		#endregion fields
 
 		#region constructors
+
 		/// <summary>Class constructor from <see cref="DockingManager"/>.</summary>
 		/// <param name="manager"></param>
 		internal AutoHideWindowManager(DockingManager manager)
@@ -39,6 +42,7 @@ internal AutoHideWindowManager(DockingManager manager)
 		#endregion constructors
 
 		#region public methods
+
 		/// <summary>Method is invoked to pop put an Anchorable that was in AutoHide mode.</summary>
 		/// <param name="anchor"><see cref="LayoutAnchorControl"/> to pop out of the side panel.</param>
 		public void ShowAutoHideWindow(LayoutAnchorControl anchor)
@@ -65,9 +69,11 @@ public void HideAutoWindow(LayoutAnchorControl anchor = null)
 			else
 				System.Diagnostics.Debug.Assert(false);
 		}
+
 		#endregion public methods
 
 		#region private methods
+
 		private void SetupCloseTimer()
 		{
 			_closeTimer = new DispatcherTimer(DispatcherPriority.Background);
@@ -94,6 +100,7 @@ private void StopCloseTimer()
 			_manager.AutoHideWindow.Hide();
 			_currentAutohiddenAnchor = null;
 		}
+
 		#endregion private methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/ContextMenuEx.cs b/source/Components/AvalonDock/Controls/ContextMenuEx.cs
index 232f7d90..fe421d03 100644
--- a/source/Components/AvalonDock/Controls/ContextMenuEx.cs
+++ b/source/Components/AvalonDock/Controls/ContextMenuEx.cs
@@ -45,4 +45,4 @@ protected override void OnOpened(System.Windows.RoutedEventArgs e)
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/DockingManagerDropTarget.cs b/source/Components/AvalonDock/Controls/DockingManagerDropTarget.cs
index 009f5f76..c5108b24 100644
--- a/source/Components/AvalonDock/Controls/DockingManagerDropTarget.cs
+++ b/source/Components/AvalonDock/Controls/DockingManagerDropTarget.cs
@@ -7,18 +7,18 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
 	/// <summary>
 	/// Implements a <see cref="DockingManager"/> drop target
 	/// on which other items (<see cref="LayoutDocument"/> or <see cref="LayoutAnchorable"/>) can be dropped.
-	/// 
+	///
 	/// The resulting drop targets are usually the 4 outer drop target buttons
 	/// re-presenting a <see cref="LayoutAnchorSideControl"/> shown as overlay
 	/// on the <see cref="DockingManager"/> when the user drags an item over it.
@@ -26,12 +26,15 @@ namespace AvalonDock.Controls
 	internal class DockingManagerDropTarget : DropTarget<DockingManager>
 	{
 		#region fields
+
 		private DockingManager _manager;
-		#endregion  fields
+
+		#endregion fields
 
 		#region Constructors
+
 		/// <summary>
-		/// Class constructor 
+		/// Class constructor
 		/// </summary>
 		/// <param name="manager"></param>
 		/// <param name="detectionRect"></param>
@@ -43,6 +46,7 @@ internal DockingManagerDropTarget(DockingManager manager,
 		{
 			_manager = manager;
 		}
+
 		#endregion Constructors
 
 		#region Overrides
@@ -57,150 +61,160 @@ protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
 			switch (Type)
 			{
 				case DropTargetType.DockingManagerDockLeft:
-				#region DropTargetType.DockingManagerDockLeft
-				{
-					if (_manager.Layout.RootPanel.Orientation != System.Windows.Controls.Orientation.Horizontal &&
-						_manager.Layout.RootPanel.Children.Count == 1)
-						_manager.Layout.RootPanel.Orientation = System.Windows.Controls.Orientation.Horizontal;
 
-					if (_manager.Layout.RootPanel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+					#region DropTargetType.DockingManagerDockLeft
+
 					{
-						var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
-						if (layoutAnchorablePaneGroup != null &&
-							layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal)
+						if (_manager.Layout.RootPanel.Orientation != System.Windows.Controls.Orientation.Horizontal &&
+							_manager.Layout.RootPanel.Children.Count == 1)
+							_manager.Layout.RootPanel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+						if (_manager.Layout.RootPanel.Orientation == System.Windows.Controls.Orientation.Horizontal)
 						{
-							var childrenToTransfer = layoutAnchorablePaneGroup.Children.ToArray();
-							for (int i = 0; i < childrenToTransfer.Length; i++)
-								_manager.Layout.RootPanel.Children.Insert(i, childrenToTransfer[i]);
+							var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+							if (layoutAnchorablePaneGroup != null &&
+								layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal)
+							{
+								var childrenToTransfer = layoutAnchorablePaneGroup.Children.ToArray();
+								for (int i = 0; i < childrenToTransfer.Length; i++)
+									_manager.Layout.RootPanel.Children.Insert(i, childrenToTransfer[i]);
+							}
+							else
+								_manager.Layout.RootPanel.Children.Insert(0, floatingWindow.RootPanel);
 						}
 						else
-							_manager.Layout.RootPanel.Children.Insert(0, floatingWindow.RootPanel);
-					}
-					else
-					{
-						var newOrientedPanel = new LayoutPanel()
 						{
-							Orientation = System.Windows.Controls.Orientation.Horizontal
-						};
+							var newOrientedPanel = new LayoutPanel()
+							{
+								Orientation = System.Windows.Controls.Orientation.Horizontal
+							};
 
-						newOrientedPanel.Children.Add(floatingWindow.RootPanel);
-						newOrientedPanel.Children.Add(_manager.Layout.RootPanel);
+							newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+							newOrientedPanel.Children.Add(_manager.Layout.RootPanel);
 
-						_manager.Layout.RootPanel = newOrientedPanel;
+							_manager.Layout.RootPanel = newOrientedPanel;
+						}
 					}
-				}
-				break;
+					break;
+
 				#endregion DropTargetType.DockingManagerDockLeft
 
 				case DropTargetType.DockingManagerDockRight:
-				#region DropTargetType.DockingManagerDockRight
-				{
-					if (_manager.Layout.RootPanel.Orientation != System.Windows.Controls.Orientation.Horizontal &&
-						_manager.Layout.RootPanel.Children.Count == 1)
-						_manager.Layout.RootPanel.Orientation = System.Windows.Controls.Orientation.Horizontal;
 
-					if (_manager.Layout.RootPanel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+					#region DropTargetType.DockingManagerDockRight
+
 					{
-						var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
-						if (layoutAnchorablePaneGroup != null &&
-							layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal)
+						if (_manager.Layout.RootPanel.Orientation != System.Windows.Controls.Orientation.Horizontal &&
+							_manager.Layout.RootPanel.Children.Count == 1)
+							_manager.Layout.RootPanel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+						if (_manager.Layout.RootPanel.Orientation == System.Windows.Controls.Orientation.Horizontal)
 						{
-							var childrenToTransfer = layoutAnchorablePaneGroup.Children.ToArray();
-							for (int i = 0; i < childrenToTransfer.Length; i++)
-								_manager.Layout.RootPanel.Children.Add(childrenToTransfer[i]);
+							var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+							if (layoutAnchorablePaneGroup != null &&
+								layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal)
+							{
+								var childrenToTransfer = layoutAnchorablePaneGroup.Children.ToArray();
+								for (int i = 0; i < childrenToTransfer.Length; i++)
+									_manager.Layout.RootPanel.Children.Add(childrenToTransfer[i]);
+							}
+							else
+								_manager.Layout.RootPanel.Children.Add(floatingWindow.RootPanel);
 						}
 						else
-							_manager.Layout.RootPanel.Children.Add(floatingWindow.RootPanel);
-					}
-					else
-					{
-						var newOrientedPanel = new LayoutPanel()
 						{
-							Orientation = System.Windows.Controls.Orientation.Horizontal
-						};
-
-						newOrientedPanel.Children.Add(floatingWindow.RootPanel);
-						newOrientedPanel.Children.Insert(0, _manager.Layout.RootPanel);
+							var newOrientedPanel = new LayoutPanel()
+							{
+								Orientation = System.Windows.Controls.Orientation.Horizontal
+							};
 
+							newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+							newOrientedPanel.Children.Insert(0, _manager.Layout.RootPanel);
 
-						_manager.Layout.RootPanel = newOrientedPanel;
+							_manager.Layout.RootPanel = newOrientedPanel;
+						}
 					}
-				}
-				break;
+					break;
+
 				#endregion DropTargetType.DockingManagerDockRight
 
 				case DropTargetType.DockingManagerDockTop:
-				#region DropTargetType.DockingManagerDockTop
-				{
-					if (_manager.Layout.RootPanel.Orientation != System.Windows.Controls.Orientation.Vertical &&
-						_manager.Layout.RootPanel.Children.Count == 1)
-						_manager.Layout.RootPanel.Orientation = System.Windows.Controls.Orientation.Vertical;
 
-					if (_manager.Layout.RootPanel.Orientation == System.Windows.Controls.Orientation.Vertical)
+					#region DropTargetType.DockingManagerDockTop
+
 					{
-						var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
-						if (layoutAnchorablePaneGroup != null &&
-							layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical)
+						if (_manager.Layout.RootPanel.Orientation != System.Windows.Controls.Orientation.Vertical &&
+							_manager.Layout.RootPanel.Children.Count == 1)
+							_manager.Layout.RootPanel.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+						if (_manager.Layout.RootPanel.Orientation == System.Windows.Controls.Orientation.Vertical)
 						{
-							var childrenToTransfer = layoutAnchorablePaneGroup.Children.ToArray();
-							for (int i = 0; i < childrenToTransfer.Length; i++)
-								_manager.Layout.RootPanel.Children.Insert(i, childrenToTransfer[i]);
+							var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+							if (layoutAnchorablePaneGroup != null &&
+								layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical)
+							{
+								var childrenToTransfer = layoutAnchorablePaneGroup.Children.ToArray();
+								for (int i = 0; i < childrenToTransfer.Length; i++)
+									_manager.Layout.RootPanel.Children.Insert(i, childrenToTransfer[i]);
+							}
+							else
+								_manager.Layout.RootPanel.Children.Insert(0, floatingWindow.RootPanel);
 						}
 						else
-							_manager.Layout.RootPanel.Children.Insert(0, floatingWindow.RootPanel);
-					}
-					else
-					{
-						var newOrientedPanel = new LayoutPanel()
 						{
-							Orientation = System.Windows.Controls.Orientation.Vertical
-						};
+							var newOrientedPanel = new LayoutPanel()
+							{
+								Orientation = System.Windows.Controls.Orientation.Vertical
+							};
 
-						newOrientedPanel.Children.Add(floatingWindow.RootPanel);
-						newOrientedPanel.Children.Add(_manager.Layout.RootPanel);
+							newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+							newOrientedPanel.Children.Add(_manager.Layout.RootPanel);
 
-						_manager.Layout.RootPanel = newOrientedPanel;
+							_manager.Layout.RootPanel = newOrientedPanel;
+						}
 					}
-				}
-				break;
+					break;
+
 				#endregion DropTargetType.DockingManagerDockTop
 
 				case DropTargetType.DockingManagerDockBottom:
-				#region DropTargetType.DockingManagerDockBottom
-				{
-					if (_manager.Layout.RootPanel.Orientation != System.Windows.Controls.Orientation.Vertical &&
-						_manager.Layout.RootPanel.Children.Count == 1)
-						_manager.Layout.RootPanel.Orientation = System.Windows.Controls.Orientation.Vertical;
 
-					if (_manager.Layout.RootPanel.Orientation == System.Windows.Controls.Orientation.Vertical)
+					#region DropTargetType.DockingManagerDockBottom
+
 					{
-						var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
-						if (layoutAnchorablePaneGroup != null &&
-							layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical)
-						{
-							var childrenToTransfer = layoutAnchorablePaneGroup.Children.ToArray();
-							for (int i = 0; i < childrenToTransfer.Length; i++)
-								_manager.Layout.RootPanel.Children.Add(childrenToTransfer[i]);
+						if (_manager.Layout.RootPanel.Orientation != System.Windows.Controls.Orientation.Vertical &&
+							_manager.Layout.RootPanel.Children.Count == 1)
+							_manager.Layout.RootPanel.Orientation = System.Windows.Controls.Orientation.Vertical;
 
+						if (_manager.Layout.RootPanel.Orientation == System.Windows.Controls.Orientation.Vertical)
+						{
+							var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+							if (layoutAnchorablePaneGroup != null &&
+								layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical)
+							{
+								var childrenToTransfer = layoutAnchorablePaneGroup.Children.ToArray();
+								for (int i = 0; i < childrenToTransfer.Length; i++)
+									_manager.Layout.RootPanel.Children.Add(childrenToTransfer[i]);
+							}
+							else
+								_manager.Layout.RootPanel.Children.Add(floatingWindow.RootPanel);
 						}
 						else
-							_manager.Layout.RootPanel.Children.Add(floatingWindow.RootPanel);
-					}
-					else
-					{
-						var newOrientedPanel = new LayoutPanel()
 						{
-							Orientation = System.Windows.Controls.Orientation.Vertical
-						};
+							var newOrientedPanel = new LayoutPanel()
+							{
+								Orientation = System.Windows.Controls.Orientation.Vertical
+							};
 
-						newOrientedPanel.Children.Add(floatingWindow.RootPanel);
-						newOrientedPanel.Children.Insert(0, _manager.Layout.RootPanel);
+							newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+							newOrientedPanel.Children.Insert(0, _manager.Layout.RootPanel);
 
-						_manager.Layout.RootPanel = newOrientedPanel;
+							_manager.Layout.RootPanel = newOrientedPanel;
+						}
 					}
-				}
-				break;
-				#endregion DropTargetType.DockingManagerDockBottom
+					break;
+
+					#endregion DropTargetType.DockingManagerDockBottom
 			}
 
 			base.Drop(floatingWindow);
@@ -226,56 +240,57 @@ public override Geometry GetPreviewPath(OverlayWindow overlayWindow,
 			switch (Type)
 			{
 				case DropTargetType.DockingManagerDockLeft:
-				{
-					var desideredWidth = layoutAnchorablePane.DockWidth.IsAbsolute ? layoutAnchorablePane.DockWidth.Value : layoutAnchorablePaneWithActualSize.ActualWidth;
-					var previewBoxRect = new Rect(
-						targetScreenRect.Left - overlayWindow.Left,
-						targetScreenRect.Top - overlayWindow.Top,
-						Math.Min(desideredWidth, targetScreenRect.Width / 2.0),
-						targetScreenRect.Height);
-
-					return new RectangleGeometry(previewBoxRect);
-				}
+					{
+						var desideredWidth = layoutAnchorablePane.DockWidth.IsAbsolute ? layoutAnchorablePane.DockWidth.Value : layoutAnchorablePaneWithActualSize.ActualWidth;
+						var previewBoxRect = new Rect(
+							targetScreenRect.Left - overlayWindow.Left,
+							targetScreenRect.Top - overlayWindow.Top,
+							Math.Min(desideredWidth, targetScreenRect.Width / 2.0),
+							targetScreenRect.Height);
+
+						return new RectangleGeometry(previewBoxRect);
+					}
 
 				case DropTargetType.DockingManagerDockTop:
-				{
-					var desideredHeight = layoutAnchorablePane.DockHeight.IsAbsolute ? layoutAnchorablePane.DockHeight.Value : layoutAnchorablePaneWithActualSize.ActualHeight;
-					var previewBoxRect = new Rect(
-						targetScreenRect.Left - overlayWindow.Left,
-						targetScreenRect.Top - overlayWindow.Top,
-						targetScreenRect.Width,
-						Math.Min(desideredHeight, targetScreenRect.Height / 2.0));
-
-					return new RectangleGeometry(previewBoxRect);
-				}
+					{
+						var desideredHeight = layoutAnchorablePane.DockHeight.IsAbsolute ? layoutAnchorablePane.DockHeight.Value : layoutAnchorablePaneWithActualSize.ActualHeight;
+						var previewBoxRect = new Rect(
+							targetScreenRect.Left - overlayWindow.Left,
+							targetScreenRect.Top - overlayWindow.Top,
+							targetScreenRect.Width,
+							Math.Min(desideredHeight, targetScreenRect.Height / 2.0));
+
+						return new RectangleGeometry(previewBoxRect);
+					}
 
 				case DropTargetType.DockingManagerDockRight:
-				{
-					var desideredWidth = layoutAnchorablePane.DockWidth.IsAbsolute ? layoutAnchorablePane.DockWidth.Value : layoutAnchorablePaneWithActualSize.ActualWidth;
-					var previewBoxRect = new Rect(
-						targetScreenRect.Right - overlayWindow.Left - Math.Min(desideredWidth, targetScreenRect.Width / 2.0),
-						targetScreenRect.Top - overlayWindow.Top,
-						Math.Min(desideredWidth, targetScreenRect.Width / 2.0),
-						targetScreenRect.Height);
-
-					return new RectangleGeometry(previewBoxRect);
-				}
+					{
+						var desideredWidth = layoutAnchorablePane.DockWidth.IsAbsolute ? layoutAnchorablePane.DockWidth.Value : layoutAnchorablePaneWithActualSize.ActualWidth;
+						var previewBoxRect = new Rect(
+							targetScreenRect.Right - overlayWindow.Left - Math.Min(desideredWidth, targetScreenRect.Width / 2.0),
+							targetScreenRect.Top - overlayWindow.Top,
+							Math.Min(desideredWidth, targetScreenRect.Width / 2.0),
+							targetScreenRect.Height);
+
+						return new RectangleGeometry(previewBoxRect);
+					}
 
 				case DropTargetType.DockingManagerDockBottom:
-				{
-					var desideredHeight = layoutAnchorablePane.DockHeight.IsAbsolute ? layoutAnchorablePane.DockHeight.Value : layoutAnchorablePaneWithActualSize.ActualHeight;
-					var previewBoxRect = new Rect(
-						targetScreenRect.Left - overlayWindow.Left,
-						targetScreenRect.Bottom - overlayWindow.Top - Math.Min(desideredHeight, targetScreenRect.Height / 2.0),
-						targetScreenRect.Width,
-						Math.Min(desideredHeight, targetScreenRect.Height / 2.0));
-
-					return new RectangleGeometry(previewBoxRect);
-				}
+					{
+						var desideredHeight = layoutAnchorablePane.DockHeight.IsAbsolute ? layoutAnchorablePane.DockHeight.Value : layoutAnchorablePaneWithActualSize.ActualHeight;
+						var previewBoxRect = new Rect(
+							targetScreenRect.Left - overlayWindow.Left,
+							targetScreenRect.Bottom - overlayWindow.Top - Math.Min(desideredHeight, targetScreenRect.Height / 2.0),
+							targetScreenRect.Width,
+							Math.Min(desideredHeight, targetScreenRect.Height / 2.0));
+
+						return new RectangleGeometry(previewBoxRect);
+					}
 			}
 
 			throw new InvalidOperationException();
 		}
+
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs b/source/Components/AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs
index 685f152c..a11e38ca 100644
--- a/source/Components/AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs
+++ b/source/Components/AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs
@@ -7,11 +7,11 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -22,11 +22,14 @@ namespace AvalonDock.Controls
 	internal class DocumentPaneDropAsAnchorableTarget : DropTarget<LayoutDocumentPaneControl>
 	{
 		#region fields
+
 		private LayoutDocumentPaneControl _targetPane;
 		private int _tabIndex = -1;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>
 		/// Class constructor from parameters without a specific tabindex as dock position.
 		/// </summary>
@@ -58,9 +61,11 @@ internal DocumentPaneDropAsAnchorableTarget(LayoutDocumentPaneControl paneContro
 			_targetPane = paneControl;
 			_tabIndex = tabIndex;
 		}
+
 		#endregion Constructors
 
 		#region Overrides
+
 		/// <summary>
 		/// Method is invoked to complete a drag & drop operation with a (new) docking position
 		/// by docking of the LayoutAnchorable <paramref name="floatingWindow"/> into this drop target.
@@ -76,123 +81,132 @@ protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
 			switch (Type)
 			{
 				case DropTargetType.DocumentPaneDockAsAnchorableBottom:
-				#region DropTargetType.DocumentPaneDockAsAnchorableBottom
-				{
-					if (parentGroupPanel != null &&
-						parentGroupPanel.ChildrenCount == 1)
-						parentGroupPanel.Orientation = System.Windows.Controls.Orientation.Vertical;
 
-					if (parentGroupPanel != null &&
-						parentGroupPanel.Orientation == System.Windows.Controls.Orientation.Vertical)
-					{
-						parentGroupPanel.Children.Insert(
-							parentGroupPanel.IndexOfChild(parentGroup != null ? parentGroup : targetModel) + 1,
-							floatingWindow.RootPanel);
-					}
-					else if (parentGroupPanel != null)
-					{
-						var newParentPanel = new LayoutPanel() { Orientation = System.Windows.Controls.Orientation.Vertical };
-						parentGroupPanel.ReplaceChild(parentGroup != null ? parentGroup : targetModel, newParentPanel);
-						newParentPanel.Children.Add(parentGroup != null ? parentGroup : targetModel);
-						newParentPanel.Children.Add(floatingWindow.RootPanel);
-					}
-					else
+					#region DropTargetType.DocumentPaneDockAsAnchorableBottom
+
 					{
-						throw new NotImplementedException();
+						if (parentGroupPanel != null &&
+							parentGroupPanel.ChildrenCount == 1)
+							parentGroupPanel.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+						if (parentGroupPanel != null &&
+							parentGroupPanel.Orientation == System.Windows.Controls.Orientation.Vertical)
+						{
+							parentGroupPanel.Children.Insert(
+								parentGroupPanel.IndexOfChild(parentGroup != null ? parentGroup : targetModel) + 1,
+								floatingWindow.RootPanel);
+						}
+						else if (parentGroupPanel != null)
+						{
+							var newParentPanel = new LayoutPanel() { Orientation = System.Windows.Controls.Orientation.Vertical };
+							parentGroupPanel.ReplaceChild(parentGroup != null ? parentGroup : targetModel, newParentPanel);
+							newParentPanel.Children.Add(parentGroup != null ? parentGroup : targetModel);
+							newParentPanel.Children.Add(floatingWindow.RootPanel);
+						}
+						else
+						{
+							throw new NotImplementedException();
+						}
 					}
+					break;
 
-
-				}
-				break;
 				#endregion DropTargetType.DocumentPaneDockAsAnchorableBottom
 
 				case DropTargetType.DocumentPaneDockAsAnchorableTop:
-				#region DropTargetType.DocumentPaneDockAsAnchorableTop
-				{
-					if (parentGroupPanel != null &&
-						parentGroupPanel.ChildrenCount == 1)
-						parentGroupPanel.Orientation = System.Windows.Controls.Orientation.Vertical;
 
-					if (parentGroupPanel != null &&
-						parentGroupPanel.Orientation == System.Windows.Controls.Orientation.Vertical)
-					{
-						parentGroupPanel.Children.Insert(
-							parentGroupPanel.IndexOfChild(parentGroup != null ? parentGroup : targetModel),
-							floatingWindow.RootPanel);
-					}
-					else if (parentGroupPanel != null)
-					{
-						var newParentPanel = new LayoutPanel() { Orientation = System.Windows.Controls.Orientation.Vertical };
-						parentGroupPanel.ReplaceChild(parentGroup != null ? parentGroup : targetModel, newParentPanel);
-						newParentPanel.Children.Add(parentGroup != null ? parentGroup : targetModel);
-						newParentPanel.Children.Insert(0, floatingWindow.RootPanel);
-					}
-					else
+					#region DropTargetType.DocumentPaneDockAsAnchorableTop
+
 					{
-						throw new NotImplementedException();
+						if (parentGroupPanel != null &&
+							parentGroupPanel.ChildrenCount == 1)
+							parentGroupPanel.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+						if (parentGroupPanel != null &&
+							parentGroupPanel.Orientation == System.Windows.Controls.Orientation.Vertical)
+						{
+							parentGroupPanel.Children.Insert(
+								parentGroupPanel.IndexOfChild(parentGroup != null ? parentGroup : targetModel),
+								floatingWindow.RootPanel);
+						}
+						else if (parentGroupPanel != null)
+						{
+							var newParentPanel = new LayoutPanel() { Orientation = System.Windows.Controls.Orientation.Vertical };
+							parentGroupPanel.ReplaceChild(parentGroup != null ? parentGroup : targetModel, newParentPanel);
+							newParentPanel.Children.Add(parentGroup != null ? parentGroup : targetModel);
+							newParentPanel.Children.Insert(0, floatingWindow.RootPanel);
+						}
+						else
+						{
+							throw new NotImplementedException();
+						}
 					}
+					break;
 
-				}
-				break;
 				#endregion DropTargetType.DocumentPaneDockAsAnchorableTop
 
 				case DropTargetType.DocumentPaneDockAsAnchorableLeft:
-				#region DropTargetType.DocumentPaneDockAsAnchorableLeft
-				{
-					if (parentGroupPanel != null &&
-						parentGroupPanel.ChildrenCount == 1)
-						parentGroupPanel.Orientation = System.Windows.Controls.Orientation.Horizontal;
 
-					if (parentGroupPanel != null &&
-						parentGroupPanel.Orientation == System.Windows.Controls.Orientation.Horizontal)
-					{
-						parentGroupPanel.Children.Insert(
-							parentGroupPanel.IndexOfChild(parentGroup != null ? parentGroup : targetModel),
-							floatingWindow.RootPanel);
-					}
-					else if (parentGroupPanel != null)
-					{
-						var newParentPanel = new LayoutPanel() { Orientation = System.Windows.Controls.Orientation.Horizontal };
-						parentGroupPanel.ReplaceChild(parentGroup != null ? parentGroup : targetModel, newParentPanel);
-						newParentPanel.Children.Add(parentGroup != null ? parentGroup : targetModel);
-						newParentPanel.Children.Insert(0, floatingWindow.RootPanel);
-					}
-					else
+					#region DropTargetType.DocumentPaneDockAsAnchorableLeft
+
 					{
-						throw new NotImplementedException();
+						if (parentGroupPanel != null &&
+							parentGroupPanel.ChildrenCount == 1)
+							parentGroupPanel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+						if (parentGroupPanel != null &&
+							parentGroupPanel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+						{
+							parentGroupPanel.Children.Insert(
+								parentGroupPanel.IndexOfChild(parentGroup != null ? parentGroup : targetModel),
+								floatingWindow.RootPanel);
+						}
+						else if (parentGroupPanel != null)
+						{
+							var newParentPanel = new LayoutPanel() { Orientation = System.Windows.Controls.Orientation.Horizontal };
+							parentGroupPanel.ReplaceChild(parentGroup != null ? parentGroup : targetModel, newParentPanel);
+							newParentPanel.Children.Add(parentGroup != null ? parentGroup : targetModel);
+							newParentPanel.Children.Insert(0, floatingWindow.RootPanel);
+						}
+						else
+						{
+							throw new NotImplementedException();
+						}
 					}
-				}
-				break;
+					break;
+
 				#endregion DropTargetType.DocumentPaneDockAsAnchorableLeft
 
 				case DropTargetType.DocumentPaneDockAsAnchorableRight:
-				#region DropTargetType.DocumentPaneDockAsAnchorableRight
-				{
-					if (parentGroupPanel != null &&
-						parentGroupPanel.ChildrenCount == 1)
-						parentGroupPanel.Orientation = System.Windows.Controls.Orientation.Horizontal;
 
-					if (parentGroupPanel != null &&
-						parentGroupPanel.Orientation == System.Windows.Controls.Orientation.Horizontal)
-					{
-						parentGroupPanel.Children.Insert(
-							parentGroupPanel.IndexOfChild(parentGroup != null ? parentGroup : targetModel) + 1,
-							floatingWindow.RootPanel);
-					}
-					else if (parentGroupPanel != null)
-					{
-						var newParentPanel = new LayoutPanel() { Orientation = System.Windows.Controls.Orientation.Horizontal };
-						parentGroupPanel.ReplaceChild(parentGroup != null ? parentGroup : targetModel, newParentPanel);
-						newParentPanel.Children.Add(parentGroup != null ? parentGroup : targetModel);
-						newParentPanel.Children.Add(floatingWindow.RootPanel);
-					}
-					else
+					#region DropTargetType.DocumentPaneDockAsAnchorableRight
+
 					{
-						throw new NotImplementedException();
+						if (parentGroupPanel != null &&
+							parentGroupPanel.ChildrenCount == 1)
+							parentGroupPanel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+						if (parentGroupPanel != null &&
+							parentGroupPanel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+						{
+							parentGroupPanel.Children.Insert(
+								parentGroupPanel.IndexOfChild(parentGroup != null ? parentGroup : targetModel) + 1,
+								floatingWindow.RootPanel);
+						}
+						else if (parentGroupPanel != null)
+						{
+							var newParentPanel = new LayoutPanel() { Orientation = System.Windows.Controls.Orientation.Horizontal };
+							parentGroupPanel.ReplaceChild(parentGroup != null ? parentGroup : targetModel, newParentPanel);
+							newParentPanel.Children.Add(parentGroup != null ? parentGroup : targetModel);
+							newParentPanel.Children.Add(floatingWindow.RootPanel);
+						}
+						else
+						{
+							throw new NotImplementedException();
+						}
 					}
-				}
-				break;
-				#endregion DropTargetType.DocumentPaneDockAsAnchorableRight
+					break;
+
+					#endregion DropTargetType.DocumentPaneDockAsAnchorableRight
 			}
 
 			base.Drop(floatingWindow);
@@ -237,38 +251,39 @@ public override Geometry GetPreviewPath(OverlayWindow overlayWindow, LayoutFloat
 			switch (Type)
 			{
 				case DropTargetType.DocumentPaneDockAsAnchorableBottom:
-				{
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-					targetScreenRect.Offset(0.0, targetScreenRect.Height - targetScreenRect.Height / 3.0);
-					targetScreenRect.Height /= 3.0;
-					return new RectangleGeometry(targetScreenRect);
-				}
+					{
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+						targetScreenRect.Offset(0.0, targetScreenRect.Height - targetScreenRect.Height / 3.0);
+						targetScreenRect.Height /= 3.0;
+						return new RectangleGeometry(targetScreenRect);
+					}
 
 				case DropTargetType.DocumentPaneDockAsAnchorableTop:
-				{
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-					targetScreenRect.Height /= 3.0;
-					return new RectangleGeometry(targetScreenRect);
-				}
+					{
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+						targetScreenRect.Height /= 3.0;
+						return new RectangleGeometry(targetScreenRect);
+					}
 
 				case DropTargetType.DocumentPaneDockAsAnchorableRight:
-				{
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-					targetScreenRect.Offset(targetScreenRect.Width - targetScreenRect.Width / 3.0, 0.0);
-					targetScreenRect.Width /= 3.0;
-					return new RectangleGeometry(targetScreenRect);
-				}
+					{
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+						targetScreenRect.Offset(targetScreenRect.Width - targetScreenRect.Width / 3.0, 0.0);
+						targetScreenRect.Width /= 3.0;
+						return new RectangleGeometry(targetScreenRect);
+					}
 
 				case DropTargetType.DocumentPaneDockAsAnchorableLeft:
-				{
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-					targetScreenRect.Width /= 3.0;
-					return new RectangleGeometry(targetScreenRect);
-				}
+					{
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+						targetScreenRect.Width /= 3.0;
+						return new RectangleGeometry(targetScreenRect);
+					}
 			}
 
 			return null;
 		}
+
 		#endregion Overrides
 
 		#region Private Methods
@@ -308,4 +323,4 @@ private bool FindParentLayoutDocumentPane(ILayoutDocumentPane documentPane, out
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs b/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs
index fa5e63b3..d5dfa2eb 100644
--- a/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs
+++ b/source/Components/AvalonDock/Controls/DocumentPaneDropTarget.cs
@@ -7,10 +7,10 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -21,11 +21,14 @@ namespace AvalonDock.Controls
 	internal class DocumentPaneDropTarget : DropTarget<LayoutDocumentPaneControl>
 	{
 		#region fields
+
 		private LayoutDocumentPaneControl _targetPane;
 		private int _tabIndex = -1;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>
 		/// Class constructor from parameters without a specific tabindex as dock position.
 		/// </summary>
@@ -58,9 +61,11 @@ internal DocumentPaneDropTarget(LayoutDocumentPaneControl paneControl,
 			_targetPane = paneControl;
 			_tabIndex = tabIndex;
 		}
+
 		#endregion Constructors
 
 		#region Overrides
+
 		/// <summary>
 		/// Method is invoked to complete a drag & drop operation with a (new) docking position
 		/// by docking of the LayoutDocument <paramref name="floatingWindow"/> into this drop target.
@@ -74,204 +79,215 @@ protected override void Drop(LayoutDocumentFloatingWindow floatingWindow)
 			switch (Type)
 			{
 				case DropTargetType.DocumentPaneDockBottom:
-				#region DropTargetType.DocumentPaneDockBottom
-				{
-					var parentModel = targetModel.Parent as ILayoutGroup;
-					var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
-					int insertToIndex = parentModel.IndexOfChild(targetModel);
 
-					if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Vertical &&
-						parentModel.ChildrenCount == 1)
-						parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Vertical;
+					#region DropTargetType.DocumentPaneDockBottom
 
-					if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Vertical)
 					{
-						var layoutDocumentPaneGroup = floatingWindow.RootPanel as LayoutDocumentPaneGroup;
-						if (layoutDocumentPaneGroup != null &&
-							(layoutDocumentPaneGroup.Children.Count == 1 ||
-								layoutDocumentPaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical))
+						var parentModel = targetModel.Parent as ILayoutGroup;
+						var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
+						int insertToIndex = parentModel.IndexOfChild(targetModel);
+
+						if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Vertical &&
+							parentModel.ChildrenCount == 1)
+							parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+						if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Vertical)
 						{
-							var documentsToMove = layoutDocumentPaneGroup.Children.ToArray();
-							for (int i = 0; i < documentsToMove.Length; i++)
-								parentModel.InsertChildAt(insertToIndex + 1 + i, documentsToMove[i]);
+							var layoutDocumentPaneGroup = floatingWindow.RootPanel as LayoutDocumentPaneGroup;
+							if (layoutDocumentPaneGroup != null &&
+								(layoutDocumentPaneGroup.Children.Count == 1 ||
+									layoutDocumentPaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical))
+							{
+								var documentsToMove = layoutDocumentPaneGroup.Children.ToArray();
+								for (int i = 0; i < documentsToMove.Length; i++)
+									parentModel.InsertChildAt(insertToIndex + 1 + i, documentsToMove[i]);
+							}
+							else
+								parentModel.InsertChildAt(insertToIndex + 1, floatingWindow.RootPanel);
 						}
 						else
-							parentModel.InsertChildAt(insertToIndex + 1, floatingWindow.RootPanel);
-					}
-					else
-					{
-						var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
-						var newOrientedPanel = new LayoutDocumentPaneGroup()
 						{
-							Orientation = System.Windows.Controls.Orientation.Vertical,
-							DockWidth = targetModelAsPositionableElement.DockWidth,
-							DockHeight = targetModelAsPositionableElement.DockHeight,
-						};
-
-						parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
-						newOrientedPanel.Children.Add(targetModel);
-						newOrientedPanel.Children.Add(floatingWindow.RootPanel);
-
+							var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
+							var newOrientedPanel = new LayoutDocumentPaneGroup()
+							{
+								Orientation = System.Windows.Controls.Orientation.Vertical,
+								DockWidth = targetModelAsPositionableElement.DockWidth,
+								DockHeight = targetModelAsPositionableElement.DockHeight,
+							};
+
+							parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
+							newOrientedPanel.Children.Add(targetModel);
+							newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+						}
 					}
-				}
-				break;
+					break;
+
 				#endregion DropTargetType.DocumentPaneDockBottom
 
 				case DropTargetType.DocumentPaneDockTop:
-				#region DropTargetType.DocumentPaneDockTop
-				{
-					var parentModel = targetModel.Parent as ILayoutGroup;
-					var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
-					int insertToIndex = parentModel.IndexOfChild(targetModel);
 
-					if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Vertical &&
-						parentModel.ChildrenCount == 1)
-						parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Vertical;
+					#region DropTargetType.DocumentPaneDockTop
 
-					if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Vertical)
 					{
-						var layoutDocumentPaneGroup = floatingWindow.RootPanel as LayoutDocumentPaneGroup;
-						if (layoutDocumentPaneGroup != null &&
-							(layoutDocumentPaneGroup.Children.Count == 1 ||
-								layoutDocumentPaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical))
+						var parentModel = targetModel.Parent as ILayoutGroup;
+						var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
+						int insertToIndex = parentModel.IndexOfChild(targetModel);
+
+						if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Vertical &&
+							parentModel.ChildrenCount == 1)
+							parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+						if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Vertical)
 						{
-							var documentsToMove = layoutDocumentPaneGroup.Children.ToArray();
-							for (int i = 0; i < documentsToMove.Length; i++)
-								parentModel.InsertChildAt(insertToIndex + i, documentsToMove[i]);
+							var layoutDocumentPaneGroup = floatingWindow.RootPanel as LayoutDocumentPaneGroup;
+							if (layoutDocumentPaneGroup != null &&
+								(layoutDocumentPaneGroup.Children.Count == 1 ||
+									layoutDocumentPaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical))
+							{
+								var documentsToMove = layoutDocumentPaneGroup.Children.ToArray();
+								for (int i = 0; i < documentsToMove.Length; i++)
+									parentModel.InsertChildAt(insertToIndex + i, documentsToMove[i]);
+							}
+							else
+								parentModel.InsertChildAt(insertToIndex, floatingWindow.RootPanel);
 						}
 						else
-							parentModel.InsertChildAt(insertToIndex, floatingWindow.RootPanel);
-					}
-					else
-					{
-						var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
-						var newOrientedPanel = new LayoutDocumentPaneGroup()
 						{
-							Orientation = System.Windows.Controls.Orientation.Vertical,
-							DockWidth = targetModelAsPositionableElement.DockWidth,
-							DockHeight = targetModelAsPositionableElement.DockHeight,
-						};
-
-						parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
-						//the floating window must be added after the target modal as it could be raise a CollectGarbage call
-						newOrientedPanel.Children.Add(targetModel);
-						newOrientedPanel.Children.Insert(0, floatingWindow.RootPanel);
-
+							var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
+							var newOrientedPanel = new LayoutDocumentPaneGroup()
+							{
+								Orientation = System.Windows.Controls.Orientation.Vertical,
+								DockWidth = targetModelAsPositionableElement.DockWidth,
+								DockHeight = targetModelAsPositionableElement.DockHeight,
+							};
+
+							parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
+							//the floating window must be added after the target modal as it could be raise a CollectGarbage call
+							newOrientedPanel.Children.Add(targetModel);
+							newOrientedPanel.Children.Insert(0, floatingWindow.RootPanel);
+						}
 					}
-				}
-				break;
+					break;
+
 				#endregion DropTargetType.DocumentPaneDockTop
 
 				case DropTargetType.DocumentPaneDockLeft:
-				#region DropTargetType.DocumentPaneDockLeft
-				{
-					var parentModel = targetModel.Parent as ILayoutGroup;
-					var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
-					int insertToIndex = parentModel.IndexOfChild(targetModel);
 
-					if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Horizontal &&
-						parentModel.ChildrenCount == 1)
-						parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Horizontal;
+					#region DropTargetType.DocumentPaneDockLeft
 
-					if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Horizontal)
 					{
-						var layoutDocumentPaneGroup = floatingWindow.RootPanel as LayoutDocumentPaneGroup;
-						if (layoutDocumentPaneGroup != null &&
-							(layoutDocumentPaneGroup.Children.Count == 1 ||
-								layoutDocumentPaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal))
+						var parentModel = targetModel.Parent as ILayoutGroup;
+						var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
+						int insertToIndex = parentModel.IndexOfChild(targetModel);
+
+						if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Horizontal &&
+							parentModel.ChildrenCount == 1)
+							parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+						if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Horizontal)
 						{
-							var documentsToMove = layoutDocumentPaneGroup.Children.ToArray();
-							for (int i = 0; i < documentsToMove.Length; i++)
-								parentModel.InsertChildAt(insertToIndex + i, documentsToMove[i]);
+							var layoutDocumentPaneGroup = floatingWindow.RootPanel as LayoutDocumentPaneGroup;
+							if (layoutDocumentPaneGroup != null &&
+								(layoutDocumentPaneGroup.Children.Count == 1 ||
+									layoutDocumentPaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal))
+							{
+								var documentsToMove = layoutDocumentPaneGroup.Children.ToArray();
+								for (int i = 0; i < documentsToMove.Length; i++)
+									parentModel.InsertChildAt(insertToIndex + i, documentsToMove[i]);
+							}
+							else
+								parentModel.InsertChildAt(insertToIndex, floatingWindow.RootPanel);
 						}
 						else
-							parentModel.InsertChildAt(insertToIndex, floatingWindow.RootPanel);
-					}
-					else
-					{
-						var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
-						var newOrientedPanel = new LayoutDocumentPaneGroup()
 						{
-							Orientation = System.Windows.Controls.Orientation.Horizontal,
-							DockWidth = targetModelAsPositionableElement.DockWidth,
-							DockHeight = targetModelAsPositionableElement.DockHeight,
-						};
-
-						parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
-						//the floating window must be added after the target modal as it could be raise a CollectGarbage call
-						newOrientedPanel.Children.Add(targetModel);
-						newOrientedPanel.Children.Insert(0, floatingWindow.RootPanel);
-
+							var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
+							var newOrientedPanel = new LayoutDocumentPaneGroup()
+							{
+								Orientation = System.Windows.Controls.Orientation.Horizontal,
+								DockWidth = targetModelAsPositionableElement.DockWidth,
+								DockHeight = targetModelAsPositionableElement.DockHeight,
+							};
+
+							parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
+							//the floating window must be added after the target modal as it could be raise a CollectGarbage call
+							newOrientedPanel.Children.Add(targetModel);
+							newOrientedPanel.Children.Insert(0, floatingWindow.RootPanel);
+						}
 					}
-				}
-				break;
+					break;
+
 				#endregion DropTargetType.DocumentPaneDockLeft
 
 				case DropTargetType.DocumentPaneDockRight:
-				#region DropTargetType.DocumentPaneDockRight
-				{
-					var parentModel = targetModel.Parent as ILayoutGroup;
-					var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
-					int insertToIndex = parentModel.IndexOfChild(targetModel);
 
-					if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Horizontal &&
-						parentModel.ChildrenCount == 1)
-						parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Horizontal;
+					#region DropTargetType.DocumentPaneDockRight
 
-					if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Horizontal)
 					{
-						var layoutDocumentPaneGroup = floatingWindow.RootPanel as LayoutDocumentPaneGroup;
-						if (layoutDocumentPaneGroup != null &&
-							(layoutDocumentPaneGroup.Children.Count == 1 ||
-								layoutDocumentPaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal))
+						var parentModel = targetModel.Parent as ILayoutGroup;
+						var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
+						int insertToIndex = parentModel.IndexOfChild(targetModel);
+
+						if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Horizontal &&
+							parentModel.ChildrenCount == 1)
+							parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+						if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Horizontal)
 						{
-							var documentToMove = layoutDocumentPaneGroup.Children.ToArray();
-							for (int i = 0; i < documentToMove.Length; i++)
-								parentModel.InsertChildAt(insertToIndex + 1 + i, documentToMove[i]);
+							var layoutDocumentPaneGroup = floatingWindow.RootPanel as LayoutDocumentPaneGroup;
+							if (layoutDocumentPaneGroup != null &&
+								(layoutDocumentPaneGroup.Children.Count == 1 ||
+									layoutDocumentPaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal))
+							{
+								var documentToMove = layoutDocumentPaneGroup.Children.ToArray();
+								for (int i = 0; i < documentToMove.Length; i++)
+									parentModel.InsertChildAt(insertToIndex + 1 + i, documentToMove[i]);
+							}
+							else
+								parentModel.InsertChildAt(insertToIndex + 1, floatingWindow.RootPanel);
 						}
 						else
-							parentModel.InsertChildAt(insertToIndex + 1, floatingWindow.RootPanel);
-					}
-					else
-					{
-						var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
-						var newOrientedPanel = new LayoutDocumentPaneGroup()
 						{
-							Orientation = System.Windows.Controls.Orientation.Horizontal,
-							DockWidth = targetModelAsPositionableElement.DockWidth,
-							DockHeight = targetModelAsPositionableElement.DockHeight,
-						};
-
-						parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
-						newOrientedPanel.Children.Add(targetModel);
-						newOrientedPanel.Children.Add(floatingWindow.RootPanel);
-
+							var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
+							var newOrientedPanel = new LayoutDocumentPaneGroup()
+							{
+								Orientation = System.Windows.Controls.Orientation.Horizontal,
+								DockWidth = targetModelAsPositionableElement.DockWidth,
+								DockHeight = targetModelAsPositionableElement.DockHeight,
+							};
+
+							parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
+							newOrientedPanel.Children.Add(targetModel);
+							newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+						}
 					}
-				}
-				break;
+					break;
+
 				#endregion DropTargetType.DocumentPaneDockRight
 
 				case DropTargetType.DocumentPaneDockInside:
-				#region DropTargetType.DocumentPaneDockInside
-				{
-					var paneModel = targetModel as LayoutDocumentPane;
-					var layoutDocumentPaneGroup = floatingWindow.RootPanel as LayoutDocumentPaneGroup;
-
-					// A LayoutFloatingDocumentWindow can contain multiple instances of both Anchorables or Documents
-					// and we should drop these back into the DocumentPane if they are available
-					var allowedDropTypes = new[] { typeof(LayoutDocument), typeof(LayoutAnchorable) };
-
-					int i = _tabIndex == -1 ? 0 : _tabIndex;
-					foreach (var anchorableToImport in
-						layoutDocumentPaneGroup.Descendents().OfType<LayoutContent>()
-							.Where(item => allowedDropTypes.Contains(item.GetType())).ToArray())
+
+					#region DropTargetType.DocumentPaneDockInside
+
 					{
-						paneModel.Children.Insert(i, anchorableToImport);
-						i++;
+						var paneModel = targetModel as LayoutDocumentPane;
+						var layoutDocumentPaneGroup = floatingWindow.RootPanel as LayoutDocumentPaneGroup;
+
+						// A LayoutFloatingDocumentWindow can contain multiple instances of both Anchorables or Documents
+						// and we should drop these back into the DocumentPane if they are available
+						var allowedDropTypes = new[] { typeof(LayoutDocument), typeof(LayoutAnchorable) };
+
+						int i = _tabIndex == -1 ? 0 : _tabIndex;
+						foreach (var anchorableToImport in
+							layoutDocumentPaneGroup.Descendents().OfType<LayoutContent>()
+								.Where(item => allowedDropTypes.Contains(item.GetType())).ToArray())
+						{
+							paneModel.Children.Insert(i, anchorableToImport);
+							i++;
+						}
 					}
-				}
-				break;
-				#endregion DropTargetType.DocumentPaneDockInside
+					break;
+
+					#endregion DropTargetType.DocumentPaneDockInside
 			}
 
 			if (documentActive != null)
@@ -294,203 +310,214 @@ protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
 			switch (Type)
 			{
 				case DropTargetType.DocumentPaneDockBottom:
-				#region DropTargetType.DocumentPaneDockBottom
-				{
-					var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
-					var newLayoutDocumentPane = new LayoutDocumentPane();
 
-					if (parentModel == null)
-					{
-						var parentContainer = targetModel.Parent as ILayoutContainer;
-						var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Vertical };
-						parentContainer.ReplaceChild(targetModel, newParentModel);
-						newParentModel.Children.Add(targetModel as LayoutDocumentPane);
-						newParentModel.Children.Add(newLayoutDocumentPane);
-					}
-					else
+					#region DropTargetType.DocumentPaneDockBottom
+
 					{
-						var manager = parentModel.Root.Manager;
-						if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Vertical)
+						var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
+						var newLayoutDocumentPane = new LayoutDocumentPane();
+
+						if (parentModel == null)
 						{
-							parentModel.Orientation = System.Windows.Controls.Orientation.Vertical;
-							int targetPaneIndex = parentModel.IndexOfChild(targetModel);
-							parentModel.Children.Insert(targetPaneIndex + 1, newLayoutDocumentPane);
+							var parentContainer = targetModel.Parent as ILayoutContainer;
+							var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Vertical };
+							parentContainer.ReplaceChild(targetModel, newParentModel);
+							newParentModel.Children.Add(targetModel as LayoutDocumentPane);
+							newParentModel.Children.Add(newLayoutDocumentPane);
 						}
 						else
 						{
-							LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
-							newChildGroup.Orientation = System.Windows.Controls.Orientation.Vertical;
-							parentModel.ReplaceChild(targetModel, newChildGroup);
-							newChildGroup.Children.Add(targetModel);
-							newChildGroup.Children.Add(newLayoutDocumentPane);
+							var manager = parentModel.Root.Manager;
+							if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Vertical)
+							{
+								parentModel.Orientation = System.Windows.Controls.Orientation.Vertical;
+								int targetPaneIndex = parentModel.IndexOfChild(targetModel);
+								parentModel.Children.Insert(targetPaneIndex + 1, newLayoutDocumentPane);
+							}
+							else
+							{
+								LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
+								newChildGroup.Orientation = System.Windows.Controls.Orientation.Vertical;
+								parentModel.ReplaceChild(targetModel, newChildGroup);
+								newChildGroup.Children.Add(targetModel);
+								newChildGroup.Children.Add(newLayoutDocumentPane);
+							}
 						}
-					}
 
-					foreach (var cntToTransfer in floatingWindow.RootPanel.Descendents().OfType<LayoutAnchorable>().ToArray())
-						newLayoutDocumentPane.Children.Add(cntToTransfer);
+						foreach (var cntToTransfer in floatingWindow.RootPanel.Descendents().OfType<LayoutAnchorable>().ToArray())
+							newLayoutDocumentPane.Children.Add(cntToTransfer);
+					}
+					break;
 
-				}
-				break;
 				#endregion DropTargetType.DocumentPaneDockBottom
 
 				case DropTargetType.DocumentPaneDockTop:
-				#region DropTargetType.DocumentPaneDockTop
-				{
-					var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
-					var newLayoutDocumentPane = new LayoutDocumentPane();
 
-					if (parentModel == null)
-					{
-						var parentContainer = targetModel.Parent as ILayoutContainer;
-						var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Vertical };
-						parentContainer.ReplaceChild(targetModel, newParentModel);
-						newParentModel.Children.Add(newLayoutDocumentPane);
-						newParentModel.Children.Add(targetModel as LayoutDocumentPane);
-					}
-					else
+					#region DropTargetType.DocumentPaneDockTop
+
 					{
-						var manager = parentModel.Root.Manager;
-						if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Vertical)
+						var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
+						var newLayoutDocumentPane = new LayoutDocumentPane();
+
+						if (parentModel == null)
 						{
-							parentModel.Orientation = System.Windows.Controls.Orientation.Vertical;
-							int targetPaneIndex = parentModel.IndexOfChild(targetModel);
-							parentModel.Children.Insert(targetPaneIndex, newLayoutDocumentPane);
+							var parentContainer = targetModel.Parent as ILayoutContainer;
+							var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Vertical };
+							parentContainer.ReplaceChild(targetModel, newParentModel);
+							newParentModel.Children.Add(newLayoutDocumentPane);
+							newParentModel.Children.Add(targetModel as LayoutDocumentPane);
 						}
 						else
 						{
-							LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
-							newChildGroup.Orientation = System.Windows.Controls.Orientation.Vertical;
-							parentModel.ReplaceChild(targetModel, newChildGroup);
-							newChildGroup.Children.Add(newLayoutDocumentPane);
-							newChildGroup.Children.Add(targetModel);
+							var manager = parentModel.Root.Manager;
+							if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Vertical)
+							{
+								parentModel.Orientation = System.Windows.Controls.Orientation.Vertical;
+								int targetPaneIndex = parentModel.IndexOfChild(targetModel);
+								parentModel.Children.Insert(targetPaneIndex, newLayoutDocumentPane);
+							}
+							else
+							{
+								LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
+								newChildGroup.Orientation = System.Windows.Controls.Orientation.Vertical;
+								parentModel.ReplaceChild(targetModel, newChildGroup);
+								newChildGroup.Children.Add(newLayoutDocumentPane);
+								newChildGroup.Children.Add(targetModel);
+							}
 						}
-					}
 
-					foreach (var cntToTransfer in floatingWindow.RootPanel.Descendents().OfType<LayoutAnchorable>().ToArray())
-						newLayoutDocumentPane.Children.Add(cntToTransfer);
+						foreach (var cntToTransfer in floatingWindow.RootPanel.Descendents().OfType<LayoutAnchorable>().ToArray())
+							newLayoutDocumentPane.Children.Add(cntToTransfer);
+					}
+					break;
 
-				}
-				break;
 				#endregion DropTargetType.DocumentPaneDockTop
 
 				case DropTargetType.DocumentPaneDockLeft:
-				#region DropTargetType.DocumentPaneDockLeft
-				{
-					var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
-					var newLayoutDocumentPane = new LayoutDocumentPane();
 
-					if (parentModel == null)
-					{
-						var parentContainer = targetModel.Parent as ILayoutContainer;
-						var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Horizontal };
-						parentContainer.ReplaceChild(targetModel, newParentModel);
-						newParentModel.Children.Add(newLayoutDocumentPane);
-						newParentModel.Children.Add(targetModel as LayoutDocumentPane);
-					}
-					else
+					#region DropTargetType.DocumentPaneDockLeft
+
 					{
-						var manager = parentModel.Root.Manager;
-						if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+						var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
+						var newLayoutDocumentPane = new LayoutDocumentPane();
+
+						if (parentModel == null)
 						{
-							parentModel.Orientation = System.Windows.Controls.Orientation.Horizontal;
-							int targetPaneIndex = parentModel.IndexOfChild(targetModel);
-							parentModel.Children.Insert(targetPaneIndex, newLayoutDocumentPane);
+							var parentContainer = targetModel.Parent as ILayoutContainer;
+							var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Horizontal };
+							parentContainer.ReplaceChild(targetModel, newParentModel);
+							newParentModel.Children.Add(newLayoutDocumentPane);
+							newParentModel.Children.Add(targetModel as LayoutDocumentPane);
 						}
 						else
 						{
-							LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
-							newChildGroup.Orientation = System.Windows.Controls.Orientation.Horizontal;
-							parentModel.ReplaceChild(targetModel, newChildGroup);
-							newChildGroup.Children.Add(newLayoutDocumentPane);
-							newChildGroup.Children.Add(targetModel);
+							var manager = parentModel.Root.Manager;
+							if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+							{
+								parentModel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+								int targetPaneIndex = parentModel.IndexOfChild(targetModel);
+								parentModel.Children.Insert(targetPaneIndex, newLayoutDocumentPane);
+							}
+							else
+							{
+								LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
+								newChildGroup.Orientation = System.Windows.Controls.Orientation.Horizontal;
+								parentModel.ReplaceChild(targetModel, newChildGroup);
+								newChildGroup.Children.Add(newLayoutDocumentPane);
+								newChildGroup.Children.Add(targetModel);
+							}
 						}
 
+						foreach (var cntToTransfer in floatingWindow.RootPanel.Descendents().OfType<LayoutAnchorable>().ToArray())
+							newLayoutDocumentPane.Children.Add(cntToTransfer);
 					}
+					break;
 
-					foreach (var cntToTransfer in floatingWindow.RootPanel.Descendents().OfType<LayoutAnchorable>().ToArray())
-						newLayoutDocumentPane.Children.Add(cntToTransfer);
-				}
-				break;
 				#endregion DropTargetType.DocumentPaneDockLeft
 
 				case DropTargetType.DocumentPaneDockRight:
-				#region DropTargetType.DocumentPaneDockRight
-				{
-					var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
-					var newLayoutDocumentPane = new LayoutDocumentPane();
 
-					if (parentModel == null)
-					{
-						var parentContainer = targetModel.Parent as ILayoutContainer;
-						var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Horizontal };
-						parentContainer.ReplaceChild(targetModel, newParentModel);
-						newParentModel.Children.Add(targetModel as LayoutDocumentPane);
-						newParentModel.Children.Add(newLayoutDocumentPane);
-					}
-					else
+					#region DropTargetType.DocumentPaneDockRight
+
 					{
-						var manager = parentModel.Root.Manager;
-						if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+						var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
+						var newLayoutDocumentPane = new LayoutDocumentPane();
+
+						if (parentModel == null)
 						{
-							parentModel.Orientation = System.Windows.Controls.Orientation.Horizontal;
-							int targetPaneIndex = parentModel.IndexOfChild(targetModel);
-							parentModel.Children.Insert(targetPaneIndex + 1, newLayoutDocumentPane);
+							var parentContainer = targetModel.Parent as ILayoutContainer;
+							var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Horizontal };
+							parentContainer.ReplaceChild(targetModel, newParentModel);
+							newParentModel.Children.Add(targetModel as LayoutDocumentPane);
+							newParentModel.Children.Add(newLayoutDocumentPane);
 						}
 						else
 						{
-							LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
-							newChildGroup.Orientation = System.Windows.Controls.Orientation.Horizontal;
-							parentModel.ReplaceChild(targetModel, newChildGroup);
-							newChildGroup.Children.Add(targetModel);
-							newChildGroup.Children.Add(newLayoutDocumentPane);
+							var manager = parentModel.Root.Manager;
+							if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+							{
+								parentModel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+								int targetPaneIndex = parentModel.IndexOfChild(targetModel);
+								parentModel.Children.Insert(targetPaneIndex + 1, newLayoutDocumentPane);
+							}
+							else
+							{
+								LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
+								newChildGroup.Orientation = System.Windows.Controls.Orientation.Horizontal;
+								parentModel.ReplaceChild(targetModel, newChildGroup);
+								newChildGroup.Children.Add(targetModel);
+								newChildGroup.Children.Add(newLayoutDocumentPane);
+							}
 						}
-					}
 
-					foreach (var cntToTransfer in floatingWindow.RootPanel.Descendents().OfType<LayoutAnchorable>().ToArray())
-						newLayoutDocumentPane.Children.Add(cntToTransfer);
+						foreach (var cntToTransfer in floatingWindow.RootPanel.Descendents().OfType<LayoutAnchorable>().ToArray())
+							newLayoutDocumentPane.Children.Add(cntToTransfer);
+					}
+					break;
 
-				}
-				break;
 				#endregion DropTargetType.DocumentPaneDockRight
 
 				case DropTargetType.DocumentPaneDockInside:
-				#region DropTargetType.DocumentPaneDockInside
-				{
-					var paneModel = targetModel as LayoutDocumentPane;
-					var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
-
-					bool checkPreviousContainer = true;
-					int i = 0;
-					if (_tabIndex != -1)
-					{
-						i = _tabIndex;
-						checkPreviousContainer = false;
-					}
-					LayoutAnchorable anchorableToActivate = null;
 
-					foreach (var anchorableToImport in layoutAnchorablePaneGroup.Descendents().OfType<LayoutAnchorable>().ToArray())
+					#region DropTargetType.DocumentPaneDockInside
+
 					{
-						if (checkPreviousContainer)
+						var paneModel = targetModel as LayoutDocumentPane;
+						var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+
+						bool checkPreviousContainer = true;
+						int i = 0;
+						if (_tabIndex != -1)
 						{
-							var previousContainer = ((ILayoutPreviousContainer)anchorableToImport).PreviousContainer;
-							if (object.ReferenceEquals(previousContainer, targetModel) && (anchorableToImport.PreviousContainerIndex != -1))
-							{
-								i = anchorableToImport.PreviousContainerIndex;
-							}
+							i = _tabIndex;
 							checkPreviousContainer = false;
 						}
+						LayoutAnchorable anchorableToActivate = null;
+
+						foreach (var anchorableToImport in layoutAnchorablePaneGroup.Descendents().OfType<LayoutAnchorable>().ToArray())
+						{
+							if (checkPreviousContainer)
+							{
+								var previousContainer = ((ILayoutPreviousContainer)anchorableToImport).PreviousContainer;
+								if (object.ReferenceEquals(previousContainer, targetModel) && (anchorableToImport.PreviousContainerIndex != -1))
+								{
+									i = anchorableToImport.PreviousContainerIndex;
+								}
+								checkPreviousContainer = false;
+							}
 
-						anchorableToImport.SetCanCloseInternal(true);
+							anchorableToImport.SetCanCloseInternal(true);
 
-						paneModel.Children.Insert(i, anchorableToImport);
-						i++;
-						anchorableToActivate = anchorableToImport;
+							paneModel.Children.Insert(i, anchorableToImport);
+							i++;
+							anchorableToActivate = anchorableToImport;
+						}
+
+						anchorableToActivate.IsActive = true;
 					}
+					break;
 
-					anchorableToActivate.IsActive = true;
-				}
-				break;
-				#endregion DropTargetType.DocumentPaneDockInside
+					#endregion DropTargetType.DocumentPaneDockInside
 			}
 
 			base.Drop(floatingWindow);
@@ -510,72 +537,73 @@ public override Geometry GetPreviewPath(OverlayWindow overlayWindow,
 			switch (Type)
 			{
 				case DropTargetType.DocumentPaneDockInside:
-				{
-					var targetScreenRect = TargetElement.GetScreenArea();
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-
-					if (_tabIndex == -1)
-					{
-						return new RectangleGeometry(targetScreenRect);
-					}
-					else
 					{
-						var translatedDetectionRect = new Rect(DetectionRects[0].TopLeft, DetectionRects[0].BottomRight);
-						translatedDetectionRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-
-						var pathFigure = new PathFigure();
-						pathFigure.StartPoint = targetScreenRect.BottomRight;
-						pathFigure.Segments.Add(new LineSegment() { Point = new Point(targetScreenRect.Right, translatedDetectionRect.Bottom) });
-						pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.BottomRight });
-						pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.TopRight });
-						pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.TopLeft });
-						pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.BottomLeft });
-						pathFigure.Segments.Add(new LineSegment() { Point = new Point(targetScreenRect.Left, translatedDetectionRect.Bottom) });
-						pathFigure.Segments.Add(new LineSegment() { Point = targetScreenRect.BottomLeft });
-						pathFigure.IsClosed = true;
-						pathFigure.IsFilled = true;
-						pathFigure.Freeze();
-						return new PathGeometry(new PathFigure[] { pathFigure });
+						var targetScreenRect = TargetElement.GetScreenArea();
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+						if (_tabIndex == -1)
+						{
+							return new RectangleGeometry(targetScreenRect);
+						}
+						else
+						{
+							var translatedDetectionRect = new Rect(DetectionRects[0].TopLeft, DetectionRects[0].BottomRight);
+							translatedDetectionRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+							var pathFigure = new PathFigure();
+							pathFigure.StartPoint = targetScreenRect.BottomRight;
+							pathFigure.Segments.Add(new LineSegment() { Point = new Point(targetScreenRect.Right, translatedDetectionRect.Bottom) });
+							pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.BottomRight });
+							pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.TopRight });
+							pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.TopLeft });
+							pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.BottomLeft });
+							pathFigure.Segments.Add(new LineSegment() { Point = new Point(targetScreenRect.Left, translatedDetectionRect.Bottom) });
+							pathFigure.Segments.Add(new LineSegment() { Point = targetScreenRect.BottomLeft });
+							pathFigure.IsClosed = true;
+							pathFigure.IsFilled = true;
+							pathFigure.Freeze();
+							return new PathGeometry(new PathFigure[] { pathFigure });
+						}
 					}
-				}
 
 				case DropTargetType.DocumentPaneDockBottom:
-				{
-					var targetScreenRect = TargetElement.GetScreenArea();
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-					targetScreenRect.Offset(0.0, targetScreenRect.Height / 2.0);
-					targetScreenRect.Height /= 2.0;
-					return new RectangleGeometry(targetScreenRect);
-				}
+					{
+						var targetScreenRect = TargetElement.GetScreenArea();
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+						targetScreenRect.Offset(0.0, targetScreenRect.Height / 2.0);
+						targetScreenRect.Height /= 2.0;
+						return new RectangleGeometry(targetScreenRect);
+					}
 
 				case DropTargetType.DocumentPaneDockTop:
-				{
-					var targetScreenRect = TargetElement.GetScreenArea();
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-					targetScreenRect.Height /= 2.0;
-					return new RectangleGeometry(targetScreenRect);
-				}
+					{
+						var targetScreenRect = TargetElement.GetScreenArea();
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+						targetScreenRect.Height /= 2.0;
+						return new RectangleGeometry(targetScreenRect);
+					}
 
 				case DropTargetType.DocumentPaneDockLeft:
-				{
-					var targetScreenRect = TargetElement.GetScreenArea();
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-					targetScreenRect.Width /= 2.0;
-					return new RectangleGeometry(targetScreenRect);
-				}
+					{
+						var targetScreenRect = TargetElement.GetScreenArea();
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+						targetScreenRect.Width /= 2.0;
+						return new RectangleGeometry(targetScreenRect);
+					}
 
 				case DropTargetType.DocumentPaneDockRight:
-				{
-					var targetScreenRect = TargetElement.GetScreenArea();
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-					targetScreenRect.Offset(targetScreenRect.Width / 2.0, 0.0);
-					targetScreenRect.Width /= 2.0;
-					return new RectangleGeometry(targetScreenRect);
-				}
+					{
+						var targetScreenRect = TargetElement.GetScreenArea();
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+						targetScreenRect.Offset(targetScreenRect.Width / 2.0, 0.0);
+						targetScreenRect.Width /= 2.0;
+						return new RectangleGeometry(targetScreenRect);
+					}
 			}
 
 			return null;
 		}
+
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs b/source/Components/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
index 366029b6..df164a40 100644
--- a/source/Components/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
+++ b/source/Components/AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
@@ -7,10 +7,10 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -21,10 +21,13 @@ namespace AvalonDock.Controls
 	internal class DocumentPaneGroupDropTarget : DropTarget<LayoutDocumentPaneGroupControl>
 	{
 		#region fields
+
 		private LayoutDocumentPaneGroupControl _targetPane;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>
 		/// Class contructor
 		/// </summary>
@@ -38,9 +41,11 @@ internal DocumentPaneGroupDropTarget(LayoutDocumentPaneGroupControl paneControl,
 		{
 			_targetPane = paneControl;
 		}
+
 		#endregion Constructors
 
 		#region Overrides
+
 		/// <summary>
 		/// Method is invoked to complete a drag & drop operation with a (new) docking position
 		/// by docking of the LayoutDocument <paramref name="floatingWindow"/> into this drop target.
@@ -53,16 +58,19 @@ protected override void Drop(LayoutDocumentFloatingWindow floatingWindow)
 			switch (Type)
 			{
 				case DropTargetType.DocumentPaneGroupDockInside:
-				#region DropTargetType.DocumentPaneGroupDockInside
-				{
-					var paneGroupModel = targetModel as LayoutDocumentPaneGroup;
-					var paneModel = paneGroupModel as LayoutDocumentPaneGroup;
-					var sourceModel = floatingWindow.RootPanel as LayoutDocumentPaneGroup;
-
-					paneModel.Children.Insert(0, sourceModel);
-				}
-				break;
-				#endregion DropTargetType.DocumentPaneGroupDockInside
+
+					#region DropTargetType.DocumentPaneGroupDockInside
+
+					{
+						var paneGroupModel = targetModel as LayoutDocumentPaneGroup;
+						var paneModel = paneGroupModel as LayoutDocumentPaneGroup;
+						var sourceModel = floatingWindow.RootPanel as LayoutDocumentPaneGroup;
+
+						paneModel.Children.Insert(0, sourceModel);
+					}
+					break;
+
+					#endregion DropTargetType.DocumentPaneGroupDockInside
 			}
 
 			base.Drop(floatingWindow);
@@ -80,23 +88,26 @@ protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
 			switch (Type)
 			{
 				case DropTargetType.DocumentPaneGroupDockInside:
-				#region DropTargetType.DocumentPaneGroupDockInside
-				{
-					var paneGroupModel = targetModel as LayoutDocumentPaneGroup;
-					var paneModel = paneGroupModel.Children[0] as LayoutDocumentPane;
-					var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
-
-					int i = 0;
-					foreach (var anchorableToImport in layoutAnchorablePaneGroup.Descendents().OfType<LayoutAnchorable>().ToArray())
-					{
-						anchorableToImport.SetCanCloseInternal(true);
 
-						paneModel.Children.Insert(i, anchorableToImport);
-						i++;
+					#region DropTargetType.DocumentPaneGroupDockInside
+
+					{
+						var paneGroupModel = targetModel as LayoutDocumentPaneGroup;
+						var paneModel = paneGroupModel.Children[0] as LayoutDocumentPane;
+						var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+
+						int i = 0;
+						foreach (var anchorableToImport in layoutAnchorablePaneGroup.Descendents().OfType<LayoutAnchorable>().ToArray())
+						{
+							anchorableToImport.SetCanCloseInternal(true);
+
+							paneModel.Children.Insert(i, anchorableToImport);
+							i++;
+						}
 					}
-				}
-				break;
-				#endregion DropTargetType.DocumentPaneGroupDockInside
+					break;
+
+					#endregion DropTargetType.DocumentPaneGroupDockInside
 			}
 
 			base.Drop(floatingWindow);
@@ -116,18 +127,22 @@ public override Geometry GetPreviewPath(OverlayWindow overlayWindow,
 			switch (Type)
 			{
 				case DropTargetType.DocumentPaneGroupDockInside:
-				#region DropTargetType.DocumentPaneGroupDockInside
-				{
-					var targetScreenRect = TargetElement.GetScreenArea();
-					targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
-
-					return new RectangleGeometry(targetScreenRect);
-				}
-				#endregion DropTargetType.DocumentPaneGroupDockInside
+
+					#region DropTargetType.DocumentPaneGroupDockInside
+
+					{
+						var targetScreenRect = TargetElement.GetScreenArea();
+						targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+						return new RectangleGeometry(targetScreenRect);
+					}
+
+					#endregion DropTargetType.DocumentPaneGroupDockInside
 			}
 
 			return null;
 		}
+
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/DocumentPaneTabPanel.cs b/source/Components/AvalonDock/Controls/DocumentPaneTabPanel.cs
index 6886df1f..156b2056 100644
--- a/source/Components/AvalonDock/Controls/DocumentPaneTabPanel.cs
+++ b/source/Components/AvalonDock/Controls/DocumentPaneTabPanel.cs
@@ -7,11 +7,11 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
-using AvalonDock.Layout;
+using System.Windows.Controls;
 
 namespace AvalonDock.Controls
 {
@@ -90,7 +90,6 @@ protected override Size ArrangeOverride(Size finalSize)
 				}
 			}
 			return finalSize;
-
 		}
 
 		protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
@@ -103,7 +102,6 @@ protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
 			//    LayoutDocumentTabItem.ResetDraggingItem();
 			//    System.Diagnostics.Trace.WriteLine("OnMouseLeave()");
 
-
 			//    manager.StartDraggingFloatingWindowForContent(contentModel);
 			//}
 
@@ -112,4 +110,4 @@ protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/DragService.cs b/source/Components/AvalonDock/Controls/DragService.cs
index 1d0da1dd..0b7ca91a 100644
--- a/source/Components/AvalonDock/Controls/DragService.cs
+++ b/source/Components/AvalonDock/Controls/DragService.cs
@@ -7,10 +7,10 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -18,15 +18,15 @@ namespace AvalonDock.Controls
 	/// This class manages the drag & drop behavior when the user drags a:
 	/// - document (<see cref="LayoutDocument"/>) or
 	/// - tool window (<see cref="LayoutAnchorable"/>) and drops it in an alternative position.
-	/// 
+	///
 	/// The <see cref="LayoutFloatingWindowControl"/> contains a <see cref="DragService"/> field
 	/// in order to implement the drag behavior for inheriting classes
 	/// (<see cref="LayoutDocumentFloatingWindowControl"/> and <see cref="LayoutAnchorableFloatingWindowControl"/>).
-	/// 
+	///
 	/// Dragging a <see cref="LayoutDocument"/> usually results in a converted <see cref="LayoutDocumentFloatingWindow"/>
 	/// being actually dragged around. Likewise, Dragging a <see cref="LayoutAnchorable"/> usually
 	/// results in a converted <see cref="LayoutAnchorableFloatingWindow"/> being dragged around.
-	/// 
+	///
 	/// The behavior at the drop position can be that the floating window control is converted back into its
 	/// original class type and being inserted/dropped at the final drop target position. But its also possible
 	/// that the floating window control remains a floating window if the user simply drags an item out and positions
@@ -44,6 +44,7 @@ namespace AvalonDock.Controls
 	internal class DragService
 	{
 		#region fields
+
 		private DockingManager _manager;
 		private LayoutFloatingWindowControl _floatingWindow;
 
@@ -54,9 +55,11 @@ internal class DragService
 		private IOverlayWindow _currentWindow;
 		private List<IDropArea> _currentWindowAreas = new List<IDropArea>();
 		private IDropTarget _currentDropTarget;
-		#endregion  fields
+
+		#endregion fields
 
 		#region Constructors
+
 		/// <summary>
 		/// Class constructor from <see cref="LayoutFloatingWindowControl"/> that is using this
 		/// service to implement its drag and drop (dock) behavior.
@@ -69,9 +72,11 @@ public DragService(LayoutFloatingWindowControl floatingWindow)
 
 			GetOverlayWindowHosts();
 		}
+
 		#endregion Constructors
 
 		#region Internal Methods
+
 		/// <summary>
 		/// Method is invoked by the <see cref="LayoutFloatingWindowControl"/> to update the
 		/// current mouse position as the user drags the floating window with the mouse cursor.
@@ -170,7 +175,7 @@ internal void UpdateMouseLocation(Point dragPosition)
 		/// Method is invoked by the <see cref="LayoutFloatingWindowControl"/> to indicate that the
 		/// <see cref="LayoutFloatingWindowControl"/> (and its content) should be dropped/docked at
 		/// the current mouse position.
-		/// 
+		///
 		/// The drop/dock behavior depends on whether the current mouse position is an actual drop target
 		/// the item being dragged, and the item being docked (if any) etc.
 		/// </summary>
@@ -233,6 +238,7 @@ internal void Abort()
 
 			_currentHost = null;
 		}
+
 		#endregion Internal Methods
 
 		#region Private Methods
@@ -260,4 +266,4 @@ private void GetOverlayWindowHosts()
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/DropArea.cs b/source/Components/AvalonDock/Controls/DropArea.cs
index a442dec1..33748ccd 100644
--- a/source/Components/AvalonDock/Controls/DropArea.cs
+++ b/source/Components/AvalonDock/Controls/DropArea.cs
@@ -16,10 +16,13 @@ public enum DropAreaType
 	{
 		/// <summary> This type of drop area identifies a <seealso cref="AvalonDock.DockingManager"/> which is the visual root of the AvalonDock control library.</summary>
 		DockingManager,
+
 		/// <summary>This type of drop area identifies a <see cref="LayoutDocumentPaneControl"/>.</summary>
 		DocumentPane,
+
 		/// <summary>This type of drop area identifies a <see cref="LayoutDocumentPaneGroupControl"/>.</summary>
 		DocumentPaneGroup,
+
 		/// <summary>This type of drop area identifies a <see cref="LayoutAnchorablePaneControl"/>.</summary>
 		AnchorablePane,
 	}
@@ -44,11 +47,8 @@ public interface IDropArea
 	/// <seealso cref="FrameworkElement"/>
 	public class DropArea<T> : IDropArea where T : FrameworkElement
 	{
-		#region fields
-
-		#endregion  fields
-
 		#region Constructors
+
 		/// <summary>Class constructor from control that can be used as drop target and it's type of drop area. </summary>
 		/// <param name="areaElement"></param>
 		/// <param name="type">the type of drop area for this drop target.</param>
@@ -68,7 +68,7 @@ internal DropArea(T areaElement, DropAreaType type)
 
 		/// <inheritdoc />
 		public DropAreaType Type { get; }
-		
+
 		#endregion IDropArea
 
 		#region Properties
@@ -81,4 +81,4 @@ internal DropArea(T areaElement, DropAreaType type)
 
 		#endregion Properties
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/DropDownButton.cs b/source/Components/AvalonDock/Controls/DropDownButton.cs
index 6bf21e30..d636fbd9 100644
--- a/source/Components/AvalonDock/Controls/DropDownButton.cs
+++ b/source/Components/AvalonDock/Controls/DropDownButton.cs
@@ -7,9 +7,9 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
-using System.Windows.Controls.Primitives;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 
 namespace AvalonDock.Controls
 {
@@ -41,7 +41,7 @@ public DropDownButton()
 				new FrameworkPropertyMetadata(null, OnDropDownContextMenuChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="DropDownContextMenu"/> property. This dependency property 
+		/// Gets or sets the <see cref="DropDownContextMenu"/> property. This dependency property
 		/// indicates drop down menu to show up when user click on an anchorable menu pin.
 		/// </summary>
 		public ContextMenu DropDownContextMenu
@@ -69,7 +69,7 @@ protected virtual void OnDropDownContextMenuChanged(DependencyPropertyChangedEve
 				new FrameworkPropertyMetadata(null));
 
 		/// <summary>
-		/// Gets or sets the <see cref="DropDownContextMenuDataContext"/> property. This dependency property 
+		/// Gets or sets the <see cref="DropDownContextMenuDataContext"/> property. This dependency property
 		/// indicates data context to set for drop down context menu.
 		/// </summary>
 		public object DropDownContextMenuDataContext
@@ -120,4 +120,4 @@ private void DropDownButton_Unloaded(object sender, RoutedEventArgs e)
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/DropDownControlArea.cs b/source/Components/AvalonDock/Controls/DropDownControlArea.cs
index ea310385..52c56d4f 100644
--- a/source/Components/AvalonDock/Controls/DropDownControlArea.cs
+++ b/source/Components/AvalonDock/Controls/DropDownControlArea.cs
@@ -18,7 +18,7 @@ namespace AvalonDock.Controls
 	/// Implements the title display for various items: <see cref="LayoutAnchorablePaneControl"/>,
 	/// <see cref="LayoutDocumentTabItem"/>, <see cref="LayoutAnchorableTabItem"/>,
 	/// <see cref="LayoutDocumentFloatingWindowControl"/>, and <see cref="LayoutAnchorableFloatingWindowControl"/>.
-	/// 
+	///
 	/// The content is usually displayed via ContentPresenter binding in the theme definition.
 	/// </summary>
 	/// <seealso cref="ContentControl"/>
@@ -33,7 +33,7 @@ public class DropDownControlArea : ContentControl
 				new FrameworkPropertyMetadata(null));
 
 		/// <summary>
-		/// Gets or sets the <see cref="DropDownContextMenu"/> property. This dependency property 
+		/// Gets or sets the <see cref="DropDownContextMenu"/> property. This dependency property
 		/// indicates context menu to show when a right click is detected over the area occupied by the control.
 		/// </summary>
 		public ContextMenu DropDownContextMenu
@@ -51,7 +51,7 @@ public ContextMenu DropDownContextMenu
 				new FrameworkPropertyMetadata(null));
 
 		/// <summary>
-		/// Gets or sets the <see cref="DropDownContextMenuDataContext"/> property. This dependency property 
+		/// Gets or sets the <see cref="DropDownContextMenuDataContext"/> property. This dependency property
 		/// indicates data context to attach when context menu is shown.
 		/// </summary>
 		public object DropDownContextMenuDataContext
@@ -90,4 +90,4 @@ protected override void OnPreviewMouseRightButtonUp(System.Windows.Input.MouseBu
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/DropTarget.cs b/source/Components/AvalonDock/Controls/DropTarget.cs
index 13a7fce3..c1c31ca3 100644
--- a/source/Components/AvalonDock/Controls/DropTarget.cs
+++ b/source/Components/AvalonDock/Controls/DropTarget.cs
@@ -7,12 +7,12 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using AvalonDock.Layout;
 using System.Windows.Threading;
 
 namespace AvalonDock.Controls
@@ -25,9 +25,11 @@ namespace AvalonDock.Controls
 	internal abstract class DropTarget<T> : DropTargetBase, IDropTarget where T : FrameworkElement
 	{
 		#region fields
+
 		private Rect[] _detectionRect;
 		private T _targetElement;
 		private DropTargetType _type;
+
 		#endregion fields
 
 		#region Constructors
@@ -46,7 +48,7 @@ protected DropTarget(T targetElement, IEnumerable<Rect> detectionRects, DropTarg
 			_type = type;
 		}
 
-		#endregion
+		#endregion Constructors
 
 		#region Properties
 
@@ -74,13 +76,14 @@ public DropTargetType Type
 			}
 		}
 
-		#endregion
+		#endregion Properties
 
 		#region Overrides
+
 		/// <summary>
 		/// Method is invoked to complete a drag & drop operation with a (new) docking position
 		/// by docking of the LayoutAnchorable <paramref name="floatingWindow"/> into this drop target.
-		/// 
+		///
 		/// Inheriting classes should override this method to implement their own custom logic.
 		/// </summary>
 		/// <param name="floatingWindow"></param>
@@ -91,13 +94,14 @@ protected virtual void Drop(LayoutAnchorableFloatingWindow floatingWindow)
 		/// <summary>
 		/// Method is invoked to complete a drag & drop operation with a (new) docking position
 		/// by docking of the LayoutDocument <paramref name="floatingWindow"/> into this drop target.
-		/// 
+		///
 		/// Inheriting classes should override this method to implement their own custom logic.
 		/// </summary>
 		/// <param name="floatingWindow"></param>
 		protected virtual void Drop(LayoutDocumentFloatingWindow floatingWindow)
 		{
 		}
+
 		#endregion Overrides
 
 		#region Public Methods
@@ -143,6 +147,6 @@ public void DragLeave()
 			SetIsDraggingOver(TargetElement, false);
 		}
 
-		#endregion
+		#endregion Public Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/DropTargetBase.cs b/source/Components/AvalonDock/Controls/DropTargetBase.cs
index 701565c2..b38ed2de 100644
--- a/source/Components/AvalonDock/Controls/DropTargetBase.cs
+++ b/source/Components/AvalonDock/Controls/DropTargetBase.cs
@@ -48,4 +48,4 @@ public static void SetIsDraggingOver(DependencyObject d, bool value)
 
 		#endregion Properties
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/DropTargetType.cs b/source/Components/AvalonDock/Controls/DropTargetType.cs
index 87917b67..08a48056 100644
--- a/source/Components/AvalonDock/Controls/DropTargetType.cs
+++ b/source/Components/AvalonDock/Controls/DropTargetType.cs
@@ -16,6 +16,7 @@ namespace AvalonDock.Controls
 	public enum DropTargetType
 	{
 		#region DockingManager
+
 		/// <summary>
 		/// The specific drop area is the left of the <see cref="DockingManager"/> control.
 		/// </summary>
@@ -35,9 +36,11 @@ public enum DropTargetType
 		/// The specific drop area is the bottom of the <see cref="DockingManager"/> control.
 		/// </summary>
 		DockingManagerDockBottom,
+
 		#endregion DockingManager
 
 		#region DocumentPane
+
 		/// <summary>
 		/// The specific drop area is the left of a <see cref="LayoutDocumentPaneControl"/> control.
 		/// </summary>
@@ -63,6 +66,7 @@ public enum DropTargetType
 		/// and the drop target will be part of a tabbed display).
 		/// </summary>
 		DocumentPaneDockInside,
+
 		#endregion DocumentPane
 
 		/// <summary>
@@ -72,6 +76,7 @@ public enum DropTargetType
 		DocumentPaneGroupDockInside,
 
 		#region AnchorablePane
+
 		/// <summary>
 		/// The specific drop area is the left of a <see cref="LayoutAnchorablePaneControl"/> control.
 		/// </summary>
@@ -97,13 +102,16 @@ public enum DropTargetType
 		/// and the drop target will be part of a tabbed display).
 		/// </summary>
 		AnchorablePaneDockInside,
+
 		#endregion AnchorablePane
 
 		#region DocumentPaneDockAsAnchorable
+
 		DocumentPaneDockAsAnchorableLeft,
 		DocumentPaneDockAsAnchorableTop,
 		DocumentPaneDockAsAnchorableRight,
 		DocumentPaneDockAsAnchorableBottom,
+
 		#endregion DocumentPaneDockAsAnchorable
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Extensions.cs b/source/Components/AvalonDock/Controls/Extensions.cs
index fbcc5caf..1ab728d9 100644
--- a/source/Components/AvalonDock/Controls/Extensions.cs
+++ b/source/Components/AvalonDock/Controls/Extensions.cs
@@ -67,8 +67,8 @@ public static DependencyObject FindVisualTreeRoot(this DependencyObject initial)
 					current = VisualTreeHelper.GetParent(current);
 				else
 				{
-					// If we're in Logical Land then we must walk 
-					// up the logical tree until we find a 
+					// If we're in Logical Land then we must walk
+					// up the logical tree until we find a
 					// Visual/Visual3D to get us back to Visual Land.
 					current = LogicalTreeHelper.GetParent(current);
 				}
@@ -109,4 +109,4 @@ public static T FindLogicalAncestor<T>(this DependencyObject dependencyObject) w
 			return target as T;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/FocusElementManager.cs b/source/Components/AvalonDock/Controls/FocusElementManager.cs
index 47f574a2..6db0764f 100644
--- a/source/Components/AvalonDock/Controls/FocusElementManager.cs
+++ b/source/Components/AvalonDock/Controls/FocusElementManager.cs
@@ -7,15 +7,15 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
-using System.Windows;
-using System.Diagnostics;
-using AvalonDock.Layout;
 using System.Windows.Media;
 using System.Windows.Threading;
 
@@ -92,7 +92,6 @@ internal static void FinalizeFocusManagement(DockingManager manager)
 					_windowHandler = null;
 				}
 			}
-
 		}
 
 		/// <summary>
@@ -109,7 +108,6 @@ internal static IInputElement GetLastFocusedElement(ILayoutElement model)
 			return null;
 		}
 
-
 		/// <summary>
 		/// Get the last window handle focused before user left the element passed as argument
 		/// </summary>
@@ -141,12 +139,10 @@ internal static void SetFocusOnLastElement(ILayoutElement model)
 			if (_modelFocusedWindowHandle.GetValue(model, out handleToFocus))
 				focused = IntPtr.Zero != Win32Helper.SetFocus(handleToFocus);
 
-
 			if (focused)
 			{
 				_lastFocusedElement = new WeakReference(model);
 			}
-
 		}
 
 		#endregion Internal Methods
@@ -268,6 +264,7 @@ private static void InputManager_EnterMenuMode(object sender, EventArgs e)
 
 			_lastFocusedElementBeforeEnterMenuMode = new WeakReference(Keyboard.FocusedElement);
 		}
+
 		private static void InputManager_LeaveMenuMode(object sender, EventArgs e)
 		{
 			if (_lastFocusedElementBeforeEnterMenuMode != null &&
@@ -284,4 +281,4 @@ private static void InputManager_LeaveMenuMode(object sender, EventArgs e)
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/FullWeakDictionary.cs b/source/Components/AvalonDock/Controls/FullWeakDictionary.cs
index 5c6b5a52..359e94a5 100644
--- a/source/Components/AvalonDock/Controls/FullWeakDictionary.cs
+++ b/source/Components/AvalonDock/Controls/FullWeakDictionary.cs
@@ -13,7 +13,7 @@ This program is provided to you under the terms of the Microsoft Public
 namespace AvalonDock.Controls
 {
 	/// <summary>
-	/// Implements a dictionary class that uses weak references for keys and values - 
+	/// Implements a dictionary class that uses weak references for keys and values -
 	/// that is, this dictionary uses weak references only.
 	/// </summary>
 	/// <typeparam name="K"></typeparam>
@@ -21,8 +21,10 @@ namespace AvalonDock.Controls
 	internal class FullWeakDictionary<K, V> where K : class
 	{
 		#region fields
+
 		private List<WeakReference> _keys = new List<WeakReference>();
 		private List<WeakReference> _values = new List<WeakReference>();
+
 		#endregion fields
 
 		#region Public Methods
@@ -103,7 +105,7 @@ public bool GetValue(K key, out V value)
 		/// Removes all entries where either the key or the value (or both)
 		/// have already been garbage collected.
 		/// </summary>
-		void CollectGarbage()
+		private void CollectGarbage()
 		{
 			int vIndex = 0;
 
@@ -133,4 +135,4 @@ void CollectGarbage()
 
 		#endregion Public Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/IDropTarget.cs b/source/Components/AvalonDock/Controls/IDropTarget.cs
index 4bf22baf..6a3ed90d 100644
--- a/source/Components/AvalonDock/Controls/IDropTarget.cs
+++ b/source/Components/AvalonDock/Controls/IDropTarget.cs
@@ -7,31 +7,34 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System.Windows;
 using System.Windows.Media;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
 	/// <summary>
 	/// Defines relevant methods and property for a drop target in the AvalonDock library.
-	/// 
+	///
 	/// A drop target is an individual/specific docking position where a user can drop an item to dock it.
-	/// 
+	///
 	/// This drag & drop operation (which can result in new docking position) can include interaction elements
 	/// such as a preview of the new docking position while the user hovers with the mouse
 	/// (and the item being dragged) over a specific enabled drop target.
-	/// 
+	///
 	/// This interface defines the means for implementing these interaction elements.
 	/// </summary>
 	internal interface IDropTarget
 	{
 		#region Properties
+
 		/// <summary>Gets the type of a drop target that descries a specific docking position inside a <see cref="DropAreaType"/>.</summary>
 		DropTargetType Type { get; }
-		#endregion
+
+		#endregion Properties
 
 		#region Methods
+
 		/// <summary>
 		/// Gets a <see cref="Geometry"/> that is used to highlight/preview the docking position
 		/// of this drop target for a <paramref name="floatingWindowModel"/> being docked inside an
@@ -65,6 +68,7 @@ internal interface IDropTarget
 		/// (while dragging a <see cref="LayoutFloatingWindow"/>) over this drop target.
 		/// </summary>
 		void DragLeave();
-		#endregion
+
+		#endregion Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/IOverlayWindow.cs b/source/Components/AvalonDock/Controls/IOverlayWindow.cs
index 654e89bc..5be2f7f3 100644
--- a/source/Components/AvalonDock/Controls/IOverlayWindow.cs
+++ b/source/Components/AvalonDock/Controls/IOverlayWindow.cs
@@ -17,7 +17,7 @@ namespace AvalonDock.Controls
 	/// drags a:
 	/// - documents (<see cref="LayoutDocumentControl"/>) or
 	/// - tool window (<see cref="LayoutAnchorableControl"/>) to a new docking location.
-	/// 
+	///
 	/// Docking buttons are (depending on the state of the framework) usually shown on the
 	/// center, left, right, top, and bottom side of an <see cref="OverlayWindow"/>.
 	/// </summary>
@@ -65,10 +65,10 @@ internal interface IOverlayWindow
 		/// This method is invoked by the <see cref="DragService"/> of a <see cref="LayoutFloatingWindowControl"/>,
 		/// if the mouse enters a drop area (which can be a part of a FrameworkElement that implements
 		/// the <see cref="IOverlayWindow"/> interface.
-		/// 
+		///
 		/// A drop area can contain multiple drop targets (eg.: the <see cref="DockingManager"/> contains side panels
 		/// (top, bottom, left, right) and each of them is an individual drop target.
-		/// 
+		///
 		/// The implementing control can use this method call to decide whether the drop area should
 		/// be enabled as such and whether there are any drop targets that are available as a specific
 		/// docking position.
@@ -83,10 +83,10 @@ internal interface IOverlayWindow
 		/// This method is invoked by the <see cref="DragService"/> of a <see cref="LayoutFloatingWindowControl"/>,
 		/// if the mouse leaves a drop area (which can be a part of a <see cref="System.Windows.FrameworkElement"/> that implements
 		/// the <see cref="IOverlayWindow"/> interface.
-		/// 
+		///
 		/// A drop area can contain multiple drop targets (eg.: the <see cref="DockingManager"/> contains side panels
 		/// (top, bottom, left, right) and each of them is an individual drop target.
-		/// 
+		///
 		/// The implementing control can use this method call to disable the drop area and hide
 		/// its drop targets (<see cref="IDropTarget"/>) that may have been available as a specific
 		/// docking position.
@@ -100,10 +100,10 @@ internal interface IOverlayWindow
 		/// <summary>
 		/// This method is invoked by the <see cref="DragService"/> of a <see cref="LayoutFloatingWindowControl"/>,
 		/// if the mouse enters a drop target (which is typically a part of a <see cref="IDropArea"/>).
-		/// 
+		///
 		/// A drop target is an individual/specific docking position
 		/// where a user can drop an item to dock it.
-		/// 
+		///
 		/// The implementing control can use this method call to show a preview (Highlighting PreviewBox Geometry)
 		/// of the final docking position while the user hovers the mouse of a drop target (drop target button).
 		/// </summary>
@@ -115,10 +115,10 @@ internal interface IOverlayWindow
 		/// <summary>
 		/// This method is invoked by the <see cref="DragService"/> of a <see cref="LayoutFloatingWindowControl"/>,
 		/// if the mouse leaves a drop target (which is typically a part of a <see cref="IDropArea"/>).
-		/// 
+		///
 		/// A drop target is an individual/specific docking position
 		/// where a user can drop an item to dock it.
-		/// 
+		///
 		/// The implementing control can use this method call to hide a preview (Highlighting PreviewBox Geometry)
 		/// of the final docking position while the drags the mouse away from a drop target (drop target button).
 		/// </summary>
@@ -131,7 +131,7 @@ internal interface IOverlayWindow
 		/// This method is invoked by the <see cref="DragService"/> of a <see cref="LayoutFloatingWindowControl"/>,
 		/// if a drag & drop operation is completed to display the <see cref="LayoutFloatingWindowControl"/> in a
 		/// new docking position.
-		/// 
+		///
 		/// The implementing control can use this method call to:
 		/// - hide available drop areas and their current drop targets preview (Highlighting PreviewBox Geometry)
 		/// - and re-positioning the dragged control to complete the new docking position.
@@ -141,4 +141,4 @@ internal interface IOverlayWindow
 		/// <seealso cref="LayoutFloatingWindowControl"/>
 		void DragDrop(IDropTarget target);
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/IOverlayWindowHost.cs b/source/Components/AvalonDock/Controls/IOverlayWindowHost.cs
index 51e87041..2d3ca146 100644
--- a/source/Components/AvalonDock/Controls/IOverlayWindowHost.cs
+++ b/source/Components/AvalonDock/Controls/IOverlayWindowHost.cs
@@ -19,15 +19,17 @@ namespace AvalonDock.Controls
 	internal interface IOverlayWindowHost
 	{
 		#region Properties
+
 		/// <summary>
 		/// Gets the <see cref="DockingManager"/> control that should be invoked to do the actual docking
 		/// if docking into this <see cref="IOverlayWindowHost"/> should be performed.
 		/// </summary>
 		DockingManager Manager { get; }
 
-		#endregion
+		#endregion Properties
 
 		#region Methods
+
 		/// <summary>
 		/// Determines whether the given screen coordinates are part of the <see cref="IOverlayWindowHost"/>
 		/// window or not.
@@ -61,6 +63,6 @@ internal interface IOverlayWindowHost
 		/// <returns>The associated drop areas.</returns>
 		IEnumerable<IDropArea> GetDropAreas(LayoutFloatingWindowControl draggingWindow);
 
-		#endregion
+		#endregion Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorControl.cs
index 01bf9e53..06f0cc64 100644
--- a/source/Components/AvalonDock/Controls/LayoutAnchorControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutAnchorControl.cs
@@ -7,10 +7,10 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Windows;
 using System.Windows.Controls;
-using AvalonDock.Layout;
 using System.Windows.Threading;
 
 namespace AvalonDock.Controls
@@ -22,8 +22,10 @@ namespace AvalonDock.Controls
 	public class LayoutAnchorControl : Control, ILayoutControl
 	{
 		#region fields
+
 		private LayoutAnchorable _model;
 		private DispatcherTimer _openUpTimer = null;
+
 		#endregion fields
 
 		#region Constructors
@@ -66,7 +68,7 @@ public ILayoutElement Model
 		public static readonly DependencyProperty SideProperty = SidePropertyKey.DependencyProperty;
 
 		/// <summary>
-		/// Gets the Side property.  This dependency property 
+		/// Gets the Side property.  This dependency property
 		/// indicates the anchor side of the control.
 		/// </summary>
 		public AnchorSide Side
@@ -78,7 +80,7 @@ public AnchorSide Side
 		}
 
 		/// <summary>
-		/// Provides a secure method for setting the Side property.  
+		/// Provides a secure method for setting the Side property.
 		/// This dependency property indicates the anchor side of the control.
 		/// </summary>
 		/// <param name="value">The new value for the property.</param>
@@ -122,7 +124,6 @@ protected void SetSide(AnchorSide value)
 		//    }
 		//}
 
-
 		protected override void OnMouseDown(System.Windows.Input.MouseButtonEventArgs e)
 		{
 			base.OnMouseDown(e);
@@ -158,7 +159,6 @@ protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
 			base.OnMouseLeave(e);
 		}
 
-
 		#endregion Overrides
 
 		#region Private Methods
@@ -192,4 +192,4 @@ private void _openUpTimer_Tick(object sender, EventArgs e)
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorGroupControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorGroupControl.cs
index 1ee6ed4e..bb0adbb8 100644
--- a/source/Components/AvalonDock/Controls/LayoutAnchorGroupControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutAnchorGroupControl.cs
@@ -7,11 +7,11 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
-using System.Linq;
-using System.Windows.Controls;
-using System.Collections.ObjectModel;
 using AvalonDock.Layout;
+using System.Collections.ObjectModel;
+using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Data;
 
 namespace AvalonDock.Controls
@@ -23,8 +23,10 @@ namespace AvalonDock.Controls
 	public class LayoutAnchorGroupControl : Control, ILayoutControl
 	{
 		#region fields
+
 		private ObservableCollection<LayoutAnchorControl> _childViews = new ObservableCollection<LayoutAnchorControl>();
 		private LayoutAnchorGroup _model;
+
 		#endregion fields
 
 		#region Constructors
@@ -113,4 +115,4 @@ private void OnModelChildrenCollectionChanged(System.Collections.Specialized.Not
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorSideControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorSideControl.cs
index cba3ecce..c378c955 100644
--- a/source/Components/AvalonDock/Controls/LayoutAnchorSideControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutAnchorSideControl.cs
@@ -7,12 +7,12 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
+using System.Collections.ObjectModel;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
-using System.Collections.ObjectModel;
-using AvalonDock.Layout;
+using System.Windows.Controls;
 
 namespace AvalonDock.Controls
 {
@@ -27,11 +27,14 @@ namespace AvalonDock.Controls
 	public class LayoutAnchorSideControl : Control, ILayoutControl
 	{
 		#region fields
+
 		private readonly LayoutAnchorSide _model = null;
 		private readonly ObservableCollection<LayoutAnchorGroupControl> _childViews = new ObservableCollection<LayoutAnchorGroupControl>();
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>Static class constructor</summary>
 		static LayoutAnchorSideControl()
 		{
@@ -48,6 +51,7 @@ internal LayoutAnchorSideControl(LayoutAnchorSide model)
 
 			Unloaded += LayoutAnchorSideControl_Unloaded;
 		}
+
 		#endregion Constructors
 
 		#region Properties
@@ -127,6 +131,7 @@ internal LayoutAnchorSideControl(LayoutAnchorSide model)
 		#endregion Properties
 
 		#region Private Methods
+
 		/// <summary>
 		/// Executes when the element is removed from within an element tree of loaded elements.
 		/// </summary>
@@ -181,4 +186,4 @@ private void UpdateSide()
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorableControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorableControl.cs
index eb3e23ea..9971c6c6 100644
--- a/source/Components/AvalonDock/Controls/LayoutAnchorableControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutAnchorableControl.cs
@@ -7,9 +7,9 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System.Windows;
 using System.Windows.Controls;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -19,6 +19,7 @@ namespace AvalonDock.Controls
 	public class LayoutAnchorableControl : Control
 	{
 		#region Constructors
+
 		/// <summary>
 		/// Static class constructor
 		/// </summary>
@@ -36,6 +37,7 @@ public LayoutAnchorableControl()
 			//SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });
 			Unloaded += LayoutAnchorableControl_Unloaded;
 		}
+
 		#endregion Constructors
 
 		#region Properties
@@ -59,7 +61,7 @@ public LayoutAnchorable Model
 		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="Model"/> property.</summary>
 		protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
 		{
-			if (e.OldValue != null) ((LayoutContent) e.OldValue).PropertyChanged -= Model_PropertyChanged;
+			if (e.OldValue != null) ((LayoutContent)e.OldValue).PropertyChanged -= Model_PropertyChanged;
 			if (Model != null)
 			{
 				Model.PropertyChanged += Model_PropertyChanged;
@@ -93,7 +95,7 @@ private void Model_PropertyChanged(object sender, System.ComponentModel.Property
 		public LayoutItem LayoutItem => (LayoutItem)GetValue(LayoutItemProperty);
 
 		/// <summary>
-		/// Provides a secure method for setting the <see cref="LayoutItem"/> property.  
+		/// Provides a secure method for setting the <see cref="LayoutItem"/> property.
 		/// This dependency property indicates the LayoutItem attached to this tag item.
 		/// </summary>
 		/// <param name="value">The new value for the property.</param>
@@ -104,10 +106,11 @@ private void Model_PropertyChanged(object sender, System.ComponentModel.Property
 		#endregion Properties
 
 		#region Methods
+
 		/// <inheritdoc/>
 		protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e)
 		{
-			if (Model != null) 
+			if (Model != null)
 				Model.IsActive = true;
 			base.OnGotKeyboardFocus(e);
 		}
@@ -125,6 +128,7 @@ private void LayoutAnchorableControl_Unloaded(object sender, RoutedEventArgs e)
 
 			Unloaded -= LayoutAnchorableControl_Unloaded;
 		}
+
 		#endregion Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
index 705fe1df..72068589 100644
--- a/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
@@ -7,17 +7,17 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Commands;
+using AvalonDock.Converters;
+using AvalonDock.Layout;
+using Microsoft.Windows.Shell;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
-using AvalonDock.Layout;
-using AvalonDock.Converters;
-using System.Windows.Controls.Primitives;
-using AvalonDock.Commands;
-using Microsoft.Windows.Shell;
 
 namespace AvalonDock.Controls
 {
@@ -31,9 +31,11 @@ namespace AvalonDock.Controls
 	public class LayoutAnchorableFloatingWindowControl : LayoutFloatingWindowControl, IOverlayWindowHost
 	{
 		#region fields
+
 		private readonly LayoutAnchorableFloatingWindow _model;
 		private OverlayWindow _overlayWindow = null;
 		private List<IDropArea> _dropAreas = null;
+
 		#endregion fields
 
 		#region Constructors
@@ -90,7 +92,7 @@ internal LayoutAnchorableFloatingWindowControl(LayoutAnchorableFloatingWindow mo
 				new FrameworkPropertyMetadata(null, OnSingleContentLayoutItemChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="SingleContentLayoutItem"/> property. This dependency property 
+		/// Gets or sets the <see cref="SingleContentLayoutItem"/> property. This dependency property
 		/// indicates the layout item of the selected content when is shown a single anchorable pane.
 		/// </summary>
 		public LayoutItem SingleContentLayoutItem
@@ -110,7 +112,7 @@ protected virtual void OnSingleContentLayoutItemChanged(DependencyPropertyChange
 		#endregion SingleContentLayoutItem
 
 		public ICommand HideWindowCommand { get; }
-		
+
 		public ICommand CloseWindowCommand { get; }
 
 		DockingManager IOverlayWindowHost.Manager => _model.Root.Manager;
@@ -179,6 +181,7 @@ IEnumerable<IDropArea> IOverlayWindowHost.GetDropAreas(LayoutFloatingWindowContr
 		#endregion Public Methods
 
 		#region Overrides
+
 		/// <inheritdoc />
 		protected override void OnInitialized(EventArgs e)
 		{
@@ -244,6 +247,7 @@ protected override IntPtr FilterMessage(IntPtr hwnd, int msg, IntPtr wParam, Int
 						handled = true;
 					}
 					break;
+
 				case Win32Helper.WM_NCRBUTTONUP:
 					if (wParam.ToInt32() == Win32Helper.HT_CAPTION)
 					{
@@ -327,10 +331,11 @@ private void LayoutAnchorableFloatingWindowControl_IsVisibleChanged(object sende
 			var visibilityBinding = GetBindingExpression(VisibilityProperty);
 			if (IsVisible && visibilityBinding == null)
 				SetBinding(VisibilityProperty, new Binding(nameof(IsVisible))
-					{ Source = _model, Converter = new BoolToVisibilityConverter(), Mode = BindingMode.OneWay, ConverterParameter = Visibility.Hidden});
+				{ Source = _model, Converter = new BoolToVisibilityConverter(), Mode = BindingMode.OneWay, ConverterParameter = Visibility.Hidden });
 		}
 
 		#region HideWindowCommand
+
 		private bool CanExecuteHideWindowCommand(object parameter)
 		{
 			var manager = Model?.Root?.Manager;
@@ -364,9 +369,11 @@ private void OnExecuteHideWindowCommand(object parameter)
 			}
 			Hide(); // Bring toolwindows inside hidden FloatingWindow back requires restart of app
 		}
+
 		#endregion HideWindowCommand
 
 		#region CloseWindowCommand
+
 		private bool CanExecuteCloseWindowCommand(object parameter)
 		{
 			var manager = Model?.Root?.Manager;
@@ -404,4 +411,4 @@ private void OnExecuteCloseWindowCommand(object parameter)
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorableItem.cs b/source/Components/AvalonDock/Controls/LayoutAnchorableItem.cs
index d1a1c8d3..e73de711 100644
--- a/source/Components/AvalonDock/Controls/LayoutAnchorableItem.cs
+++ b/source/Components/AvalonDock/Controls/LayoutAnchorableItem.cs
@@ -7,296 +7,300 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
-using System;
+using AvalonDock.Commands;
 using AvalonDock.Layout;
-using System.Windows.Input;
+using System;
 using System.Windows;
-using AvalonDock.Commands;
 using System.Windows.Data;
+using System.Windows.Input;
 
 namespace AvalonDock.Controls
 {
-    /// <inheritdoc />
-    /// <summary>
-    /// This is a wrapper for around the custom anchorable content view of <see cref="LayoutElement"/>.
-    /// Implements the <see cref="AvalonDock.Controls.LayoutItem" />
-    /// 
-    /// All DPs implemented here can be bound in a corresponding style to control parameters
-    /// in dependency properties via binding in MVVM.
-    /// </summary>
-    /// <seealso cref="AvalonDock.Controls.LayoutItem" />
-    public class LayoutAnchorableItem : LayoutItem
-    {
-        #region fields
-        private LayoutAnchorable _anchorable;   // The content of this item
-        private ICommand _defaultHideCommand;
-        private ICommand _defaultAutoHideCommand;
-        private ICommand _defaultDockCommand;
-        private readonly ReentrantFlag _visibilityReentrantFlag = new ReentrantFlag();
-        private readonly ReentrantFlag _anchorableVisibilityReentrantFlag = new ReentrantFlag();
-        #endregion fields
-
-        #region Constructors
-        /// <summary>Class constructor</summary>
-        internal LayoutAnchorableItem()
-        {
-        }
-        #endregion Constructors
-
-        #region Properties
-
-        #region HideCommand
-
-        /// <summary><see cref="HideCommand"/> dependency property.</summary>
-        public static readonly DependencyProperty HideCommandProperty = DependencyProperty.Register(nameof(HideCommand), typeof(ICommand), typeof(LayoutAnchorableItem),
-                new FrameworkPropertyMetadata(null, OnHideCommandChanged, CoerceHideCommandValue));
-
-        /// <summary>
-        /// Gets or sets the <see cref="HideCommand"/> property. This dependency property 
-        /// indicates the command to execute when an anchorable is hidden.
-        /// </summary>
-        public ICommand HideCommand
-        {
-            get => (ICommand)GetValue(HideCommandProperty);
-            set => SetValue(HideCommandProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="HideCommand"/> property.</summary>
-        private static void OnHideCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutAnchorableItem)d).OnHideCommandChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="HideCommand"/> property.</summary>
-        protected virtual void OnHideCommandChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        /// <summary>Coerces the <see cref="HideCommand"/> value.</summary>
-        private static object CoerceHideCommandValue(DependencyObject d, object value) => value;
-
-        private bool CanExecuteHideCommand(object parameter) => LayoutElement != null && _anchorable.CanHide;
-
-        private void ExecuteHideCommand(object parameter) => _anchorable?.Root?.Manager?.ExecuteHideCommand(_anchorable);
-
-        #endregion HideCommand
-
-        #region AutoHideCommand
-
-        /// <summary><see cref="AutoHideCommand"/> dependency property.</summary>
-        public static readonly DependencyProperty AutoHideCommandProperty = DependencyProperty.Register(nameof(AutoHideCommand), typeof(ICommand), typeof(LayoutAnchorableItem),
-                new FrameworkPropertyMetadata(null, OnAutoHideCommandChanged, CoerceAutoHideCommandValue));
-
-        /// <summary>
-        /// Gets or sets the <see cref="AutoHideCommand"/> property. This dependency property 
-        /// indicates the command to execute when user click the auto hide button.
-        /// </summary>
-        /// <remarks>By default this command toggles auto hide state for an anchorable.</remarks>
-        public ICommand AutoHideCommand
-        {
-            get => (ICommand)GetValue(AutoHideCommandProperty);
-            set => SetValue(AutoHideCommandProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="AutoHideCommand"/> property.</summary>
-        private static void OnAutoHideCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutAnchorableItem)d).OnAutoHideCommandChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AutoHideCommand"/> property.</summary>
-        protected virtual void OnAutoHideCommandChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        /// <summary>Coerces the <see cref="AutoHideCommand"/> value.</summary>
-        private static object CoerceAutoHideCommandValue(DependencyObject d, object value) => value;
-
-        private bool CanExecuteAutoHideCommand(object parameter)
-        {
-            if (LayoutElement == null) return false;
-            if (LayoutElement.FindParent<LayoutAnchorableFloatingWindow>() != null) return false;//is floating
-            return _anchorable.CanAutoHide;
-        }
-
-        private void ExecuteAutoHideCommand(object parameter) => _anchorable?.Root?.Manager?.ExecuteAutoHideCommand(_anchorable);
-
-        #endregion AutoHideCommand
-
-        #region DockCommand
-
-        /// <summary><see cref="DockCommand"/> dependency property.</summary>
-        public static readonly DependencyProperty DockCommandProperty = DependencyProperty.Register(nameof(DockCommand), typeof(ICommand), typeof(LayoutAnchorableItem),
-                new FrameworkPropertyMetadata(null, OnDockCommandChanged, CoerceDockCommandValue));
-
-        /// <summary>
-        /// Gets or sets the <see cref="DockCommand"/> property.  This dependency property 
-        /// indicates the command to execute when user click the Dock button.
-        /// </summary>
-        /// <remarks>By default this command moves the anchorable inside the container pane which previously hosted the object.</remarks>
-        public ICommand DockCommand
-        {
-            get => (ICommand)GetValue(DockCommandProperty);
-            set => SetValue(DockCommandProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="DockCommand"/> property.</summary>
-        private static void OnDockCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutAnchorableItem)d).OnDockCommandChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DockCommand"/> property.</summary>
-        protected virtual void OnDockCommandChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        /// <summary>Coerces the <see cref="DockCommand"/> value.</summary>
-        private static object CoerceDockCommandValue(DependencyObject d, object value) => value;
-
-        private bool CanExecuteDockCommand(object parameter) => LayoutElement?.FindParent<LayoutAnchorableFloatingWindow>() != null;
-
-        private void ExecuteDockCommand(object parameter) => LayoutElement.Root.Manager.ExecuteDockCommand(_anchorable);
-
-        #endregion DockCommand
-
-        #region CanHide
-
-        /// <summary><see cref="CanHide"/> dependency property.</summary>
-        public static readonly DependencyProperty CanHideProperty = DependencyProperty.Register(nameof(CanHide), typeof(bool), typeof(LayoutAnchorableItem), new FrameworkPropertyMetadata((bool)true,
-                    OnCanHideChanged));
-
-        /// <summary>
-        /// Gets or sets the <see cref="CanHide"/> property. This dependency property 
-        /// indicates if user can hide the anchorable item.
-        /// </summary>
-        public bool CanHide
-        {
-            get => (bool)GetValue(CanHideProperty);
-            set => SetValue(CanHideProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="CanHide"/> property.</summary>
-        private static void OnCanHideChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutAnchorableItem)d).OnCanHideChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="CanHide"/> property.</summary>
-        protected virtual void OnCanHideChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (_anchorable != null) _anchorable.CanHide = (bool)e.NewValue;
-        }
-
-        #endregion CanHide
-
-        #region CanMove
-
-        /// <summary><see cref="CanMove"/> dependency property.</summary>
-        public static readonly DependencyProperty CanMoveProperty = DependencyProperty.Register(nameof(CanMove), typeof(bool), typeof(LayoutAnchorableItem), new FrameworkPropertyMetadata((bool)true,
-                    OnCanMoveChanged));
-
-        /// <summary>
-        /// Gets or sets the <see cref="CanMove"/> property. This dependency property 
-        /// indicates if user can hide the anchorable item.
-        /// </summary>
-        public bool CanMove
-        {
-            get => (bool)GetValue(CanMoveProperty);
-            set => SetValue(CanMoveProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="CanMove"/> property.</summary>
-        private static void OnCanMoveChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutAnchorableItem)d).OnCanHideChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="CanMove"/> property.</summary>
-        protected virtual void OnCanMoveChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (_anchorable != null) _anchorable.CanMove = (bool)e.NewValue;
-        }
-
-        #endregion CanMove
-
-        #endregion Properties
-
-        #region Overrides
-
-        internal override void Attach(LayoutContent model)
-        {
-            _anchorable = model as LayoutAnchorable;
-            _anchorable.IsVisibleChanged += _anchorable_IsVisibleChanged;
-            base.Attach(model);
-        }
-
-        internal override void Detach()
-        {
-            _anchorable.IsVisibleChanged -= _anchorable_IsVisibleChanged;
-            _anchorable = null;
-            base.Detach();
-        }
-
-        /// <inheritdoc />
-        protected override bool CanExecuteDockAsDocumentCommand()
-        {
-            var canExecute = base.CanExecuteDockAsDocumentCommand();
-            if (canExecute && _anchorable != null) return _anchorable.CanDockAsTabbedDocument;
-            return canExecute;
-        }
-
-        /// <inheritdoc />
-        protected override void Close()
-        {
-            if (_anchorable.Root?.Manager == null) return;
-            var dockingManager = _anchorable.Root.Manager;
-            dockingManager.ExecuteCloseCommand(_anchorable);
-        }
-
-        /// <inheritdoc />
-        protected override void InitDefaultCommands()
-        {
-            _defaultHideCommand = new RelayCommand<object>(ExecuteHideCommand, CanExecuteHideCommand);
-            _defaultAutoHideCommand = new RelayCommand<object>(ExecuteAutoHideCommand, CanExecuteAutoHideCommand);
-            _defaultDockCommand = new RelayCommand<object>(ExecuteDockCommand, CanExecuteDockCommand);
-            base.InitDefaultCommands();
-        }
-
-        /// <inheritdoc />
-        protected override void ClearDefaultBindings()
-        {
-            if (HideCommand == _defaultHideCommand) BindingOperations.ClearBinding(this, HideCommandProperty);
-            if (AutoHideCommand == _defaultAutoHideCommand) BindingOperations.ClearBinding(this, AutoHideCommandProperty);
-            if (DockCommand == _defaultDockCommand) BindingOperations.ClearBinding(this, DockCommandProperty);
-            base.ClearDefaultBindings();
-        }
-
-        /// <inheritdoc />
-        protected override void SetDefaultBindings()
-        {
-            if (HideCommand == null) HideCommand = _defaultHideCommand;
-            if (AutoHideCommand == null) AutoHideCommand = _defaultAutoHideCommand;
-            if (DockCommand == null) DockCommand = _defaultDockCommand;
-            Visibility = _anchorable.IsVisible ? Visibility.Visible : Visibility.Hidden;
-            base.SetDefaultBindings();
-        }
-
-        /// <inheritdoc />
-        protected override void OnVisibilityChanged()
-        {
-            if (_anchorable?.Root != null && _visibilityReentrantFlag.CanEnter)
-            {
-                using (_visibilityReentrantFlag.Enter())
-                {
-                    switch (Visibility)
-                    {
-                        case Visibility.Hidden: case Visibility.Collapsed: _anchorable.Hide(false); break;
-                        case Visibility.Visible: _anchorable.Show(); break;
-                    }
-                }
-            }
-            base.OnVisibilityChanged();
-        }
-
-        #endregion Overrides
-
-        #region Private Methods
-
-        private void _anchorable_IsVisibleChanged(object sender, EventArgs e)
-        {
-            if (_anchorable?.Root == null || !_anchorableVisibilityReentrantFlag.CanEnter) return;
-            using (_anchorableVisibilityReentrantFlag.Enter())
-            {
-                Visibility = _anchorable.IsVisible ? Visibility.Visible : Visibility.Hidden;
-            }
-        }
-
-        #endregion Private Methods
-    }
-}
+	/// <inheritdoc />
+	/// <summary>
+	/// This is a wrapper for around the custom anchorable content view of <see cref="LayoutElement"/>.
+	/// Implements the <see cref="AvalonDock.Controls.LayoutItem" />
+	///
+	/// All DPs implemented here can be bound in a corresponding style to control parameters
+	/// in dependency properties via binding in MVVM.
+	/// </summary>
+	/// <seealso cref="AvalonDock.Controls.LayoutItem" />
+	public class LayoutAnchorableItem : LayoutItem
+	{
+		#region fields
+
+		private LayoutAnchorable _anchorable;   // The content of this item
+		private ICommand _defaultHideCommand;
+		private ICommand _defaultAutoHideCommand;
+		private ICommand _defaultDockCommand;
+		private readonly ReentrantFlag _visibilityReentrantFlag = new ReentrantFlag();
+		private readonly ReentrantFlag _anchorableVisibilityReentrantFlag = new ReentrantFlag();
+
+		#endregion fields
+
+		#region Constructors
+
+		/// <summary>Class constructor</summary>
+		internal LayoutAnchorableItem()
+		{
+		}
+
+		#endregion Constructors
+
+		#region Properties
+
+		#region HideCommand
+
+		/// <summary><see cref="HideCommand"/> dependency property.</summary>
+		public static readonly DependencyProperty HideCommandProperty = DependencyProperty.Register(nameof(HideCommand), typeof(ICommand), typeof(LayoutAnchorableItem),
+				new FrameworkPropertyMetadata(null, OnHideCommandChanged, CoerceHideCommandValue));
+
+		/// <summary>
+		/// Gets or sets the <see cref="HideCommand"/> property. This dependency property
+		/// indicates the command to execute when an anchorable is hidden.
+		/// </summary>
+		public ICommand HideCommand
+		{
+			get => (ICommand)GetValue(HideCommandProperty);
+			set => SetValue(HideCommandProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="HideCommand"/> property.</summary>
+		private static void OnHideCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutAnchorableItem)d).OnHideCommandChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="HideCommand"/> property.</summary>
+		protected virtual void OnHideCommandChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		/// <summary>Coerces the <see cref="HideCommand"/> value.</summary>
+		private static object CoerceHideCommandValue(DependencyObject d, object value) => value;
+
+		private bool CanExecuteHideCommand(object parameter) => LayoutElement != null && _anchorable.CanHide;
+
+		private void ExecuteHideCommand(object parameter) => _anchorable?.Root?.Manager?.ExecuteHideCommand(_anchorable);
+
+		#endregion HideCommand
+
+		#region AutoHideCommand
+
+		/// <summary><see cref="AutoHideCommand"/> dependency property.</summary>
+		public static readonly DependencyProperty AutoHideCommandProperty = DependencyProperty.Register(nameof(AutoHideCommand), typeof(ICommand), typeof(LayoutAnchorableItem),
+				new FrameworkPropertyMetadata(null, OnAutoHideCommandChanged, CoerceAutoHideCommandValue));
+
+		/// <summary>
+		/// Gets or sets the <see cref="AutoHideCommand"/> property. This dependency property
+		/// indicates the command to execute when user click the auto hide button.
+		/// </summary>
+		/// <remarks>By default this command toggles auto hide state for an anchorable.</remarks>
+		public ICommand AutoHideCommand
+		{
+			get => (ICommand)GetValue(AutoHideCommandProperty);
+			set => SetValue(AutoHideCommandProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="AutoHideCommand"/> property.</summary>
+		private static void OnAutoHideCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutAnchorableItem)d).OnAutoHideCommandChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AutoHideCommand"/> property.</summary>
+		protected virtual void OnAutoHideCommandChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		/// <summary>Coerces the <see cref="AutoHideCommand"/> value.</summary>
+		private static object CoerceAutoHideCommandValue(DependencyObject d, object value) => value;
+
+		private bool CanExecuteAutoHideCommand(object parameter)
+		{
+			if (LayoutElement == null) return false;
+			if (LayoutElement.FindParent<LayoutAnchorableFloatingWindow>() != null) return false;//is floating
+			return _anchorable.CanAutoHide;
+		}
+
+		private void ExecuteAutoHideCommand(object parameter) => _anchorable?.Root?.Manager?.ExecuteAutoHideCommand(_anchorable);
+
+		#endregion AutoHideCommand
+
+		#region DockCommand
+
+		/// <summary><see cref="DockCommand"/> dependency property.</summary>
+		public static readonly DependencyProperty DockCommandProperty = DependencyProperty.Register(nameof(DockCommand), typeof(ICommand), typeof(LayoutAnchorableItem),
+				new FrameworkPropertyMetadata(null, OnDockCommandChanged, CoerceDockCommandValue));
+
+		/// <summary>
+		/// Gets or sets the <see cref="DockCommand"/> property.  This dependency property
+		/// indicates the command to execute when user click the Dock button.
+		/// </summary>
+		/// <remarks>By default this command moves the anchorable inside the container pane which previously hosted the object.</remarks>
+		public ICommand DockCommand
+		{
+			get => (ICommand)GetValue(DockCommandProperty);
+			set => SetValue(DockCommandProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="DockCommand"/> property.</summary>
+		private static void OnDockCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutAnchorableItem)d).OnDockCommandChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DockCommand"/> property.</summary>
+		protected virtual void OnDockCommandChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		/// <summary>Coerces the <see cref="DockCommand"/> value.</summary>
+		private static object CoerceDockCommandValue(DependencyObject d, object value) => value;
+
+		private bool CanExecuteDockCommand(object parameter) => LayoutElement?.FindParent<LayoutAnchorableFloatingWindow>() != null;
+
+		private void ExecuteDockCommand(object parameter) => LayoutElement.Root.Manager.ExecuteDockCommand(_anchorable);
+
+		#endregion DockCommand
+
+		#region CanHide
+
+		/// <summary><see cref="CanHide"/> dependency property.</summary>
+		public static readonly DependencyProperty CanHideProperty = DependencyProperty.Register(nameof(CanHide), typeof(bool), typeof(LayoutAnchorableItem), new FrameworkPropertyMetadata((bool)true,
+					OnCanHideChanged));
+
+		/// <summary>
+		/// Gets or sets the <see cref="CanHide"/> property. This dependency property
+		/// indicates if user can hide the anchorable item.
+		/// </summary>
+		public bool CanHide
+		{
+			get => (bool)GetValue(CanHideProperty);
+			set => SetValue(CanHideProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="CanHide"/> property.</summary>
+		private static void OnCanHideChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutAnchorableItem)d).OnCanHideChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="CanHide"/> property.</summary>
+		protected virtual void OnCanHideChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (_anchorable != null) _anchorable.CanHide = (bool)e.NewValue;
+		}
+
+		#endregion CanHide
+
+		#region CanMove
+
+		/// <summary><see cref="CanMove"/> dependency property.</summary>
+		public static readonly DependencyProperty CanMoveProperty = DependencyProperty.Register(nameof(CanMove), typeof(bool), typeof(LayoutAnchorableItem), new FrameworkPropertyMetadata((bool)true,
+					OnCanMoveChanged));
+
+		/// <summary>
+		/// Gets or sets the <see cref="CanMove"/> property. This dependency property
+		/// indicates if user can hide the anchorable item.
+		/// </summary>
+		public bool CanMove
+		{
+			get => (bool)GetValue(CanMoveProperty);
+			set => SetValue(CanMoveProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="CanMove"/> property.</summary>
+		private static void OnCanMoveChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutAnchorableItem)d).OnCanHideChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="CanMove"/> property.</summary>
+		protected virtual void OnCanMoveChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (_anchorable != null) _anchorable.CanMove = (bool)e.NewValue;
+		}
+
+		#endregion CanMove
+
+		#endregion Properties
+
+		#region Overrides
+
+		internal override void Attach(LayoutContent model)
+		{
+			_anchorable = model as LayoutAnchorable;
+			_anchorable.IsVisibleChanged += _anchorable_IsVisibleChanged;
+			base.Attach(model);
+		}
+
+		internal override void Detach()
+		{
+			_anchorable.IsVisibleChanged -= _anchorable_IsVisibleChanged;
+			_anchorable = null;
+			base.Detach();
+		}
+
+		/// <inheritdoc />
+		protected override bool CanExecuteDockAsDocumentCommand()
+		{
+			var canExecute = base.CanExecuteDockAsDocumentCommand();
+			if (canExecute && _anchorable != null) return _anchorable.CanDockAsTabbedDocument;
+			return canExecute;
+		}
+
+		/// <inheritdoc />
+		protected override void Close()
+		{
+			if (_anchorable.Root?.Manager == null) return;
+			var dockingManager = _anchorable.Root.Manager;
+			dockingManager.ExecuteCloseCommand(_anchorable);
+		}
+
+		/// <inheritdoc />
+		protected override void InitDefaultCommands()
+		{
+			_defaultHideCommand = new RelayCommand<object>(ExecuteHideCommand, CanExecuteHideCommand);
+			_defaultAutoHideCommand = new RelayCommand<object>(ExecuteAutoHideCommand, CanExecuteAutoHideCommand);
+			_defaultDockCommand = new RelayCommand<object>(ExecuteDockCommand, CanExecuteDockCommand);
+			base.InitDefaultCommands();
+		}
+
+		/// <inheritdoc />
+		protected override void ClearDefaultBindings()
+		{
+			if (HideCommand == _defaultHideCommand) BindingOperations.ClearBinding(this, HideCommandProperty);
+			if (AutoHideCommand == _defaultAutoHideCommand) BindingOperations.ClearBinding(this, AutoHideCommandProperty);
+			if (DockCommand == _defaultDockCommand) BindingOperations.ClearBinding(this, DockCommandProperty);
+			base.ClearDefaultBindings();
+		}
+
+		/// <inheritdoc />
+		protected override void SetDefaultBindings()
+		{
+			if (HideCommand == null) HideCommand = _defaultHideCommand;
+			if (AutoHideCommand == null) AutoHideCommand = _defaultAutoHideCommand;
+			if (DockCommand == null) DockCommand = _defaultDockCommand;
+			Visibility = _anchorable.IsVisible ? Visibility.Visible : Visibility.Hidden;
+			base.SetDefaultBindings();
+		}
+
+		/// <inheritdoc />
+		protected override void OnVisibilityChanged()
+		{
+			if (_anchorable?.Root != null && _visibilityReentrantFlag.CanEnter)
+			{
+				using (_visibilityReentrantFlag.Enter())
+				{
+					switch (Visibility)
+					{
+						case Visibility.Hidden: case Visibility.Collapsed: _anchorable.Hide(false); break;
+						case Visibility.Visible: _anchorable.Show(); break;
+					}
+				}
+			}
+			base.OnVisibilityChanged();
+		}
+
+		#endregion Overrides
+
+		#region Private Methods
+
+		private void _anchorable_IsVisibleChanged(object sender, EventArgs e)
+		{
+			if (_anchorable?.Root == null || !_anchorableVisibilityReentrantFlag.CanEnter) return;
+			using (_anchorableVisibilityReentrantFlag.Enter())
+			{
+				Visibility = _anchorable.IsVisible ? Visibility.Visible : Visibility.Hidden;
+			}
+		}
+
+		#endregion Private Methods
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorablePaneControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorablePaneControl.cs
index 117ea059..86998577 100644
--- a/source/Components/AvalonDock/Controls/LayoutAnchorablePaneControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutAnchorablePaneControl.cs
@@ -7,11 +7,11 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Data;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -26,10 +26,13 @@ namespace AvalonDock.Controls
 	public class LayoutAnchorablePaneControl : TabControlEx, ILayoutControl//, ILogicalChildrenContainer
 	{
 		#region fields
+
 		private readonly LayoutAnchorablePane _model;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>Static class constructor to register WPF style keys.</summary>
 		static LayoutAnchorablePaneControl()
 		{
@@ -53,12 +56,14 @@ internal LayoutAnchorablePaneControl(LayoutAnchorablePane model, bool IsVirtuali
 		#endregion Constructors
 
 		#region Properties
+
 		/// <summary>Gets the layout model of this control.</summary>
 		public ILayoutElement Model => _model;
 
 		#endregion Properties
 
 		#region Overrides
+
 		/// <summary>
 		/// Invoked when an unhandled <see cref="System.Windows.Input.Keyboard.GotKeyboardFocus"/> attached
 		/// event reaches an element in its route that is derived from this class.
@@ -110,4 +115,4 @@ private void OnSizeChanged(object sender, SizeChangedEventArgs e)
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs
index 956513fe..b9f6f6ec 100644
--- a/source/Components/AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs
@@ -7,25 +7,28 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
-using System.Windows.Controls;
-using System.Windows;
 using AvalonDock.Layout;
+using System.Windows;
+using System.Windows.Controls;
 
 namespace AvalonDock.Controls
 {
 	/// <summary>
 	/// Implements a group control that hosts a <see cref="LayoutAnchorablePaneGroup"/> model.
-	/// 
+	///
 	/// This Grid based control can host multiple other controls in its Children collection
 	/// (<see cref="LayoutAnchorableControl"/>).
 	/// </summary>
 	public class LayoutAnchorablePaneGroupControl : LayoutGridControl<ILayoutAnchorablePane>, ILayoutControl
 	{
 		#region fields
+
 		private LayoutAnchorablePaneGroup _model;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>
 		/// Class constructor from layout model.
 		/// </summary>
@@ -70,4 +73,4 @@ protected override void OnFixChildrenDockLengths()
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorableTabItem.cs b/source/Components/AvalonDock/Controls/LayoutAnchorableTabItem.cs
index d3346e9d..9f26fdc1 100644
--- a/source/Components/AvalonDock/Controls/LayoutAnchorableTabItem.cs
+++ b/source/Components/AvalonDock/Controls/LayoutAnchorableTabItem.cs
@@ -7,11 +7,11 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -25,9 +25,11 @@ namespace AvalonDock.Controls
 	public class LayoutAnchorableTabItem : Control
 	{
 		#region fields
+
 		private bool _isMouseDown = false;
 		private static LayoutAnchorableTabItem _draggingItem = null;
 		private static bool _cancelMouseLeave = false;
+
 		#endregion fields
 
 		#region Constructors
@@ -48,7 +50,7 @@ static LayoutAnchorableTabItem()
 				new FrameworkPropertyMetadata(null, OnModelChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="Model"/> property. This dependency property 
+		/// Gets or sets the <see cref="Model"/> property. This dependency property
 		/// indicates model attached to the anchorable tab item.
 		/// </summary>
 		public LayoutContent Model
@@ -78,13 +80,13 @@ protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
 		public static readonly DependencyProperty LayoutItemProperty = LayoutItemPropertyKey.DependencyProperty;
 
 		/// <summary>
-		/// Gets the <see cref="LayoutItem"/> property. This dependency property 
+		/// Gets the <see cref="LayoutItem"/> property. This dependency property
 		/// indicates the LayoutItem attached to this tag item.
 		/// </summary>
 		public LayoutItem LayoutItem => (LayoutItem)GetValue(LayoutItemProperty);
 
 		/// <summary>
-		/// Provides a secure method for setting the <see cref="LayoutItem"/> property.  
+		/// Provides a secure method for setting the <see cref="LayoutItem"/> property.
 		/// This dependency property indicates the LayoutItem attached to this tag item.
 		/// </summary>
 		/// <param name="value">The new value for the property.</param>
@@ -107,6 +109,7 @@ protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
 		#endregion Internal Methods
 
 		#region Overrides
+
 		/// <inheritdoc />
 		protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e)
 		{
@@ -178,4 +181,4 @@ protected override void OnMouseEnter(MouseEventArgs e)
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutAutoHideWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutAutoHideWindowControl.cs
index 68c3fc74..cdbe0890 100644
--- a/source/Components/AvalonDock/Controls/LayoutAutoHideWindowControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutAutoHideWindowControl.cs
@@ -7,16 +7,16 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Linq;
-using System.Windows.Interop;
-using System.Windows.Controls;
 using System.Runtime.InteropServices;
 using System.Windows;
-using System.Windows.Input;
+using System.Windows.Controls;
 using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Media;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -28,6 +28,7 @@ namespace AvalonDock.Controls
 	public class LayoutAutoHideWindowControl : HwndHost, ILayoutControl
 	{
 		#region fields
+
 		internal LayoutAnchorableControl _internalHost = null;
 
 		private LayoutAnchorControl _anchor;
@@ -42,6 +43,7 @@ public class LayoutAutoHideWindowControl : HwndHost, ILayoutControl
 		private Border _resizerGhost = null;
 		private Window _resizerWindowHost = null;
 		private Vector _initialStartPoint;
+
 		#endregion fields
 
 		#region Constructors
@@ -69,7 +71,7 @@ internal LayoutAutoHideWindowControl()
 				new FrameworkPropertyMetadata(null));
 
 		/// <summary>
-		/// Gets or sets the <see cref="AnchorableStyle"/> property. This dependency property 
+		/// Gets or sets the <see cref="AnchorableStyle"/> property. This dependency property
 		/// indicates the style to apply to the LayoutAnchorableControl hosted in this auto hide window.
 		/// </summary>
 		public Style AnchorableStyle
@@ -87,7 +89,7 @@ public Style AnchorableStyle
 				new FrameworkPropertyMetadata(null));
 
 		/// <summary>
-		/// Gets or sets the <see cref="Background"/> property. This dependency property 
+		/// Gets or sets the <see cref="Background"/> property. This dependency property
 		/// indicates background of the autohide childwindow.
 		/// </summary>
 		public Brush Background
@@ -208,6 +210,7 @@ protected override Size ArrangeOverride(Size finalSize)
 		#endregion Overrides
 
 		#region Private Methods
+
 		private void _model_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
 		{
 			if (e.PropertyName != nameof(LayoutAnchorable.IsAutoHidden)) return;
@@ -219,7 +222,6 @@ private void CreateInternalGrid()
 			_internalGrid = new Grid { FlowDirection = FlowDirection.LeftToRight };
 			_internalGrid.SetBinding(Panel.BackgroundProperty, new Binding(nameof(Grid.Background)) { Source = this });
 
-
 			_internalHost = new LayoutAnchorableControl { Model = _model, Style = AnchorableStyle };
 			_internalHost.SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });
 
@@ -234,13 +236,14 @@ private void CreateInternalGrid()
 			{
 				case AnchorSide.Right:
 					_internalGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(_manager.GridSplitterWidth) });
-					_internalGrid.ColumnDefinitions.Add(new ColumnDefinition {Width = _model.AutoHideWidth == 0.0 ? new GridLength(_model.AutoHideMinWidth) : new GridLength(_model.AutoHideWidth, GridUnitType.Pixel)});
+					_internalGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = _model.AutoHideWidth == 0.0 ? new GridLength(_model.AutoHideMinWidth) : new GridLength(_model.AutoHideWidth, GridUnitType.Pixel) });
 					Grid.SetColumn(_resizer, 0);
 					Grid.SetColumn(_internalHost, 1);
 					_resizer.Cursor = Cursors.SizeWE;
 					HorizontalAlignment = HorizontalAlignment.Right;
 					VerticalAlignment = VerticalAlignment.Stretch;
 					break;
+
 				case AnchorSide.Left:
 					_internalGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = _model.AutoHideWidth == 0.0 ? new GridLength(_model.AutoHideMinWidth) : new GridLength(_model.AutoHideWidth, GridUnitType.Pixel) });
 					_internalGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(_manager.GridSplitterWidth) });
@@ -250,8 +253,9 @@ private void CreateInternalGrid()
 					HorizontalAlignment = HorizontalAlignment.Left;
 					VerticalAlignment = VerticalAlignment.Stretch;
 					break;
+
 				case AnchorSide.Top:
-					_internalGrid.RowDefinitions.Add(new RowDefinition {Height = _model.AutoHideHeight == 0.0 ? new GridLength(_model.AutoHideMinHeight) : new GridLength(_model.AutoHideHeight, GridUnitType.Pixel),});
+					_internalGrid.RowDefinitions.Add(new RowDefinition { Height = _model.AutoHideHeight == 0.0 ? new GridLength(_model.AutoHideMinHeight) : new GridLength(_model.AutoHideHeight, GridUnitType.Pixel), });
 					_internalGrid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(_manager.GridSplitterHeight) });
 					Grid.SetRow(_internalHost, 0);
 					Grid.SetRow(_resizer, 1);
@@ -259,9 +263,10 @@ private void CreateInternalGrid()
 					VerticalAlignment = VerticalAlignment.Top;
 					HorizontalAlignment = HorizontalAlignment.Stretch;
 					break;
+
 				case AnchorSide.Bottom:
 					_internalGrid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(_manager.GridSplitterHeight) });
-					_internalGrid.RowDefinitions.Add(new RowDefinition {Height = _model.AutoHideHeight == 0.0 ? new GridLength(_model.AutoHideMinHeight) : new GridLength(_model.AutoHideHeight, GridUnitType.Pixel),});
+					_internalGrid.RowDefinitions.Add(new RowDefinition { Height = _model.AutoHideHeight == 0.0 ? new GridLength(_model.AutoHideMinHeight) : new GridLength(_model.AutoHideHeight, GridUnitType.Pixel), });
 					Grid.SetRow(_resizer, 0);
 					Grid.SetRow(_internalHost, 1);
 					_resizer.Cursor = Cursors.SizeNS;
@@ -284,7 +289,7 @@ private void RemoveInternalGrid()
 
 		private void ShowResizerOverlayWindow(LayoutGridResizerControl splitter)
 		{
-			_resizerGhost = new Border {Background = splitter.BackgroundWhileDragging, Opacity = splitter.OpacityWhileDragging};
+			_resizerGhost = new Border { Background = splitter.BackgroundWhileDragging, Opacity = splitter.OpacityWhileDragging };
 			var areaElement = _manager.GetAutoHideAreaElement();
 			//var modelControlActualSize = this._internalHost.TransformActualSizeToAncestor();
 			var ptTopLeftScreen = areaElement.PointToScreenDPIWithoutFlowDirection(new Point());
@@ -312,7 +317,7 @@ private void ShowResizerOverlayWindow(LayoutGridResizerControl splitter)
 			else
 				Canvas.SetTop(_resizerGhost, _initialStartPoint.Y);
 
-			var panelHostResizer = new Canvas {HorizontalAlignment = HorizontalAlignment.Stretch, VerticalAlignment = VerticalAlignment.Stretch};
+			var panelHostResizer = new Canvas { HorizontalAlignment = HorizontalAlignment.Stretch, VerticalAlignment = VerticalAlignment.Stretch };
 			panelHostResizer.Children.Add(_resizerGhost);
 			_resizerWindowHost = new Window
 			{
@@ -357,33 +362,33 @@ private void OnResizerDragCompleted(object sender, System.Windows.Controls.Primi
 			switch (_side)
 			{
 				case AnchorSide.Right:
-				{
-					if (_model.AutoHideWidth == 0.0) _model.AutoHideWidth = _internalHost.ActualWidth - delta;
-					else _model.AutoHideWidth -= delta;
-					_internalGrid.ColumnDefinitions[1].Width = new GridLength(_model.AutoHideWidth, GridUnitType.Pixel);
-					break;
-				}
+					{
+						if (_model.AutoHideWidth == 0.0) _model.AutoHideWidth = _internalHost.ActualWidth - delta;
+						else _model.AutoHideWidth -= delta;
+						_internalGrid.ColumnDefinitions[1].Width = new GridLength(_model.AutoHideWidth, GridUnitType.Pixel);
+						break;
+					}
 				case AnchorSide.Left:
-				{
-					if (_model.AutoHideWidth == 0.0) _model.AutoHideWidth = _internalHost.ActualWidth + delta;
-					else _model.AutoHideWidth += delta;
-					_internalGrid.ColumnDefinitions[0].Width = new GridLength(_model.AutoHideWidth, GridUnitType.Pixel);
-					break;
-				}
+					{
+						if (_model.AutoHideWidth == 0.0) _model.AutoHideWidth = _internalHost.ActualWidth + delta;
+						else _model.AutoHideWidth += delta;
+						_internalGrid.ColumnDefinitions[0].Width = new GridLength(_model.AutoHideWidth, GridUnitType.Pixel);
+						break;
+					}
 				case AnchorSide.Top:
-				{
-					if (_model.AutoHideHeight == 0.0) _model.AutoHideHeight = _internalHost.ActualHeight + delta;
-					else _model.AutoHideHeight += delta;
-					_internalGrid.RowDefinitions[0].Height = new GridLength(_model.AutoHideHeight, GridUnitType.Pixel);
-					break;
-				}
+					{
+						if (_model.AutoHideHeight == 0.0) _model.AutoHideHeight = _internalHost.ActualHeight + delta;
+						else _model.AutoHideHeight += delta;
+						_internalGrid.RowDefinitions[0].Height = new GridLength(_model.AutoHideHeight, GridUnitType.Pixel);
+						break;
+					}
 				case AnchorSide.Bottom:
-				{
-					if (_model.AutoHideHeight == 0.0) _model.AutoHideHeight = _internalHost.ActualHeight - delta;
-					else _model.AutoHideHeight -= delta;
-					_internalGrid.RowDefinitions[1].Height = new GridLength(_model.AutoHideHeight, GridUnitType.Pixel);
-					break;
-				}
+					{
+						if (_model.AutoHideHeight == 0.0) _model.AutoHideHeight = _internalHost.ActualHeight - delta;
+						else _model.AutoHideHeight -= delta;
+						_internalGrid.RowDefinitions[1].Height = new GridLength(_model.AutoHideHeight, GridUnitType.Pixel);
+						break;
+					}
 			}
 			HideResizerOverlayWindow();
 			IsResizing = false;
@@ -415,4 +420,4 @@ private void OnResizerDragStarted(object sender, System.Windows.Controls.Primiti
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutDocumentControl.cs b/source/Components/AvalonDock/Controls/LayoutDocumentControl.cs
index 8785b157..14b59731 100644
--- a/source/Components/AvalonDock/Controls/LayoutDocumentControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutDocumentControl.cs
@@ -7,12 +7,12 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -23,6 +23,7 @@ namespace AvalonDock.Controls
 	public class LayoutDocumentControl : Control
 	{
 		#region Constructors
+
 		/// <summary>
 		/// Static class constructor
 		/// </summary>
@@ -58,7 +59,7 @@ public LayoutContent Model
 		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="Model"/> property.</summary>
 		protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
 		{
-			if (e.OldValue != null) ((LayoutContent) e.OldValue).PropertyChanged -= Model_PropertyChanged;
+			if (e.OldValue != null) ((LayoutContent)e.OldValue).PropertyChanged -= Model_PropertyChanged;
 			if (Model != null)
 			{
 				Model.PropertyChanged += Model_PropertyChanged;
@@ -88,13 +89,13 @@ private void Model_PropertyChanged(object sender, PropertyChangedEventArgs e)
 		public static readonly DependencyProperty LayoutItemProperty = LayoutItemPropertyKey.DependencyProperty;
 
 		/// <summary>
-		/// Gets the <see cref="LayoutItem"/> property. This dependency property 
+		/// Gets the <see cref="LayoutItem"/> property. This dependency property
 		/// indicates the LayoutItem attached to this tag item.
 		/// </summary>
 		public LayoutItem LayoutItem => (LayoutItem)GetValue(LayoutItemProperty);
 
 		/// <summary>
-		/// Provides a secure method for setting the <see cref="LayoutItem"/> property.  
+		/// Provides a secure method for setting the <see cref="LayoutItem"/> property.
 		/// This dependency property indicates the LayoutItem attached to this tag item.
 		/// </summary>
 		/// <param name="value">The new value for the property.</param>
@@ -127,7 +128,7 @@ protected override void OnMouseRightButtonDown(MouseButtonEventArgs e)
 			SetIsActive();
 			base.OnMouseLeftButtonDown(e);
 		}
-		
+
 		#endregion Overrides
 
 		#region Private Methods
@@ -139,4 +140,4 @@ private void SetIsActive()
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
index faebff5f..b88c016c 100644
--- a/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
@@ -7,15 +7,15 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Commands;
+using AvalonDock.Layout;
+using Microsoft.Windows.Shell;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AvalonDock.Layout;
 using System.Windows;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using AvalonDock.Commands;
-using Microsoft.Windows.Shell;
 
 namespace AvalonDock.Controls
 {
@@ -26,12 +26,15 @@ namespace AvalonDock.Controls
 	/// </summary>
 	public class LayoutDocumentFloatingWindowControl : LayoutFloatingWindowControl, IOverlayWindowHost
 	{
-        #region fields
-        private readonly LayoutDocumentFloatingWindow _model;
+		#region fields
+
+		private readonly LayoutDocumentFloatingWindow _model;
 		private List<IDropArea> _dropAreas = null;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>Static class constructor</summary>
 		static LayoutDocumentFloatingWindowControl()
 		{
@@ -62,7 +65,7 @@ internal LayoutDocumentFloatingWindowControl(LayoutDocumentFloatingWindow model)
 		{
 		}
 
-		#endregion
+		#endregion Constructors
 
 		#region Overrides
 
@@ -76,7 +79,7 @@ internal LayoutDocumentFloatingWindowControl(LayoutDocumentFloatingWindow model)
 				new FrameworkPropertyMetadata(null, OnSingleContentLayoutItemChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="SingleContentLayoutItem"/> property.  This dependency property 
+		/// Gets or sets the <see cref="SingleContentLayoutItem"/> property.  This dependency property
 		/// indicates the layout item of the selected content when is shown a single document pane.
 		/// </summary>
 		public LayoutItem SingleContentLayoutItem
@@ -93,7 +96,7 @@ protected virtual void OnSingleContentLayoutItemChanged(DependencyPropertyChange
 		{
 		}
 
-		#endregion
+		#endregion SingleContentLayoutItem
 
 		protected override void OnInitialized(EventArgs e)
 		{
@@ -105,7 +108,7 @@ protected override void OnInitialized(EventArgs e)
 			_model.RootPanel.ChildrenCollectionChanged += RootPanelOnChildrenCollectionChanged;
 		}
 
-		void Model_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		private void Model_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
 		{
 			if (e.PropertyName == nameof(LayoutDocumentFloatingWindow.RootPanel) && _model.RootPanel == null) InternalClose();
 		}
@@ -127,6 +130,7 @@ protected override IntPtr FilterMessage(IntPtr hwnd, int msg, IntPtr wParam, Int
 						handled = true;
 					}
 					break;
+
 				case Win32Helper.WM_NCRBUTTONUP:
 					if (wParam.ToInt32() == Win32Helper.HT_CAPTION)
 					{
@@ -162,7 +166,7 @@ protected override void OnClosed(EventArgs e)
 			_model.PropertyChanged -= Model_PropertyChanged;
 		}
 
-		#endregion
+		#endregion Overrides
 
 		#region Private Methods
 
@@ -202,9 +206,9 @@ bool IOverlayWindowHost.HitTest(Point dragPoint)
 
 		DockingManager IOverlayWindowHost.Manager => _model.Root.Manager;
 
-		OverlayWindow _overlayWindow = null;
+		private OverlayWindow _overlayWindow = null;
 
-		void CreateOverlayWindow()
+		private void CreateOverlayWindow()
 		{
 			if (_overlayWindow == null) _overlayWindow = new OverlayWindow(this);
 			var rectWindow = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
@@ -240,7 +244,7 @@ public IEnumerable<IDropArea> GetDropAreas(LayoutFloatingWindowControl draggingW
 			var dockAsDocument = true;
 			if (!isDraggingDocuments)
 			{
-                if (draggingWindow.Model is LayoutAnchorableFloatingWindow)
+				if (draggingWindow.Model is LayoutAnchorableFloatingWindow)
 				{
 					foreach (var item in GetAnchorableInFloatingWindow(draggingWindow))
 					{
@@ -277,17 +281,17 @@ public IEnumerable<IDropArea> GetDropAreas(LayoutFloatingWindowControl draggingW
 		private IEnumerable<LayoutAnchorable> GetAnchorableInFloatingWindow(LayoutFloatingWindowControl draggingWindow)
 		{
 			if (!(draggingWindow.Model is LayoutAnchorableFloatingWindow layoutAnchorableFloatingWindow)) yield break;
-            //big part of code for getting type
-
-            if (layoutAnchorableFloatingWindow.SinglePane is LayoutAnchorablePane layoutAnchorablePane && (layoutAnchorableFloatingWindow.IsSinglePane && layoutAnchorablePane.SelectedContent != null))
-            {
-                var layoutAnchorable = ((LayoutAnchorablePane)layoutAnchorableFloatingWindow.SinglePane).SelectedContent as LayoutAnchorable;
-                yield return layoutAnchorable;
-            }
-            else
-                foreach (var item in GetLayoutAnchorable(layoutAnchorableFloatingWindow.RootPanel))
-                    yield return item;
-        }
+			//big part of code for getting type
+
+			if (layoutAnchorableFloatingWindow.SinglePane is LayoutAnchorablePane layoutAnchorablePane && (layoutAnchorableFloatingWindow.IsSinglePane && layoutAnchorablePane.SelectedContent != null))
+			{
+				var layoutAnchorable = ((LayoutAnchorablePane)layoutAnchorableFloatingWindow.SinglePane).SelectedContent as LayoutAnchorable;
+				yield return layoutAnchorable;
+			}
+			else
+				foreach (var item in GetLayoutAnchorable(layoutAnchorableFloatingWindow.RootPanel))
+					yield return item;
+		}
 
 		/// <summary>
 		/// Finds all <see cref="LayoutAnchorable"/> objects (toolwindows) within a
@@ -305,6 +309,7 @@ internal IEnumerable<LayoutAnchorable> GetLayoutAnchorable(LayoutAnchorablePaneG
 		}
 
 		#region HideWindowCommand
+
 		public ICommand HideWindowCommand { get; }
 
 		private bool CanExecuteHideWindowCommand(object parameter)
@@ -346,13 +351,15 @@ private void OnExecuteHideWindowCommand(object parameter)
 			foreach (var anchorable in this.Model.Descendents().OfType<LayoutContent>().ToArray())
 			{
 				//if (manager.GetLayoutItemFromModel(anchorable) is LayoutAnchorableItem layoutAnchorableItem) layoutAnchorableItem.HideCommand.Execute(parameter);
-				//else 
+				//else
 				if (manager.GetLayoutItemFromModel(anchorable) is LayoutItem layoutItem) layoutItem.CloseCommand.Execute(parameter);
 			}
 		}
-		#endregion
+
+		#endregion HideWindowCommand
 
 		#region CloseWindowCommand
+
 		public ICommand CloseWindowCommand { get; }
 
 		private bool CanExecuteCloseWindowCommand(object parameter)
@@ -389,8 +396,8 @@ private void OnExecuteCloseWindowCommand(object parameter)
 			}
 		}
 
-		#endregion
+		#endregion CloseWindowCommand
 
-		#endregion
+		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutDocumentItem.cs b/source/Components/AvalonDock/Controls/LayoutDocumentItem.cs
index 34cb0367..b887432b 100644
--- a/source/Components/AvalonDock/Controls/LayoutDocumentItem.cs
+++ b/source/Components/AvalonDock/Controls/LayoutDocumentItem.cs
@@ -16,7 +16,7 @@ namespace AvalonDock.Controls
 	/// <summary>
 	/// This is a wrapper for around the custom document content view of <see cref="LayoutElement"/>.
 	/// Implements the <see cref="AvalonDock.Controls.LayoutItem" />
-	/// 
+	///
 	/// All DPs implemented here can be bound in a corresponding style to control parameters
 	/// in dependency properties via binding in MVVM.
 	/// </summary>
@@ -24,14 +24,18 @@ namespace AvalonDock.Controls
 	public class LayoutDocumentItem : LayoutItem
 	{
 		#region fields
+
 		private LayoutDocument _document;   // The content of this item
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>Class constructor</summary>
 		internal LayoutDocumentItem()
 		{
 		}
+
 		#endregion Constructors
 
 		#region Properties
@@ -43,7 +47,7 @@ internal LayoutDocumentItem()
 					new FrameworkPropertyMetadata(null, OnDescriptionChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="Description"/> property.  This dependency property 
+		/// Gets or sets the <see cref="Description"/> property.  This dependency property
 		/// indicates the description to display (in the <see cref="NavigatorWindow"/>) for the document item.
 		/// </summary>
 		public string Description
@@ -99,4 +103,4 @@ internal override void Detach()
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutDocumentPaneControl.cs b/source/Components/AvalonDock/Controls/LayoutDocumentPaneControl.cs
index 9e74d48f..175debf6 100644
--- a/source/Components/AvalonDock/Controls/LayoutDocumentPaneControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutDocumentPaneControl.cs
@@ -7,13 +7,12 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
-using System.Collections;
 using System.Collections.Specialized;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -29,10 +28,13 @@ namespace AvalonDock.Controls
 	public class LayoutDocumentPaneControl : TabControlEx, ILayoutControl//, ILogicalChildrenContainer
 	{
 		#region fields
+
 		private readonly LayoutDocumentPane _model;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>Static class constructor to register WPF style keys.</summary>
 		static LayoutDocumentPaneControl()
 		{
@@ -52,15 +54,18 @@ internal LayoutDocumentPaneControl(LayoutDocumentPane model, bool isVirtualizing
 			// this.LayoutUpdated += new EventHandler( OnLayoutUpdated );
 			this.SizeChanged += OnSizeChanged;
 		}
+
 		#endregion Constructors
 
 		#region Properties
+
 		/// <summary>Gets the layout model of this control.</summary>
 		public ILayoutElement Model => _model;
 
 		#endregion Properties
 
 		#region Overrides
+
 		/// <summary>
 		/// Invoked when an unhandled <see cref="System.Windows.UIElement.MouseLeftButtonDown"/> routed
 		/// event is raised on this element. Implement this method to add class handling
@@ -89,9 +94,9 @@ protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonE
 				_model.SelectedContent.IsActive = true;
 		}
 
-        protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
-        {
-            base.OnItemsChanged(e);
+		protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
+		{
+			base.OnItemsChanged(e);
 			if (e.Action == NotifyCollectionChangedAction.Remove)
 			{
 				foreach (var item in e.OldItems)
@@ -109,11 +114,11 @@ protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
 			}
 		}
 
-        #endregion Overrides
+		#endregion Overrides
 
-        #region Private Methods
+		#region Private Methods
 
-        private void OnSizeChanged(object sender, SizeChangedEventArgs e)
+		private void OnSizeChanged(object sender, SizeChangedEventArgs e)
 		{
 			var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize;
 			modelWithAtcualSize.ActualWidth = ActualWidth;
@@ -122,4 +127,4 @@ private void OnSizeChanged(object sender, SizeChangedEventArgs e)
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs b/source/Components/AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs
index 50637401..9eb21baa 100644
--- a/source/Components/AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs
@@ -7,22 +7,24 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
-using System.Windows.Controls;
-using System.Windows;
 using AvalonDock.Layout;
+using System.Windows;
+using System.Windows.Controls;
 
 namespace AvalonDock.Controls
 {
 	/// <summary>
 	/// Implements a group control that hosts a <see cref="LayoutDocumentPaneGroup"/> model.
-	/// 
+	///
 	/// This Grid based control can host multiple other controls in its Children collection
 	/// (<see cref="LayoutAnchorableControl"/>, <see cref="LayoutDocumentControl"/> etc).
 	/// </summary>
 	public class LayoutDocumentPaneGroupControl : LayoutGridControl<ILayoutDocumentPane>, ILayoutControl
 	{
 		#region fields
+
 		private readonly LayoutDocumentPaneGroup _model;
+
 		#endregion fields
 
 		#region Constructors
@@ -40,6 +42,7 @@ internal LayoutDocumentPaneGroupControl(LayoutDocumentPaneGroup model)
 		protected override void OnFixChildrenDockLengths()
 		{
 			#region Setup DockWidth/Height for children
+
 			if (_model.Orientation == Orientation.Horizontal)
 			{
 				for (int i = 0; i < _model.Children.Count; i++)
@@ -62,9 +65,10 @@ protected override void OnFixChildrenDockLengths()
 					}
 				}
 			}
+
 			#endregion Setup DockWidth/Height for children
 		}
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutDocumentTabItem.cs b/source/Components/AvalonDock/Controls/LayoutDocumentTabItem.cs
index 5f0ab605..f85b1c9e 100644
--- a/source/Components/AvalonDock/Controls/LayoutDocumentTabItem.cs
+++ b/source/Components/AvalonDock/Controls/LayoutDocumentTabItem.cs
@@ -7,13 +7,13 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Controls
 {
@@ -27,6 +27,7 @@ namespace AvalonDock.Controls
 	public class LayoutDocumentTabItem : ContentControl
 	{
 		#region fields
+
 		private List<Rect> _otherTabsScreenArea = null;
 		private List<TabItem> _otherTabs = null;
 		private Rect _parentDocumentTabPanelScreenArea;
@@ -34,9 +35,11 @@ public class LayoutDocumentTabItem : ContentControl
 		private bool _isMouseDown = false;
 		private Point _mouseDownPoint;
 		private bool _allowDrag = false;
+
 		#endregion fields
 
 		#region Contructors
+
 		/// <summary>Static class constructor to register WPF style keys.</summary>
 		static LayoutDocumentTabItem()
 		{
@@ -54,7 +57,7 @@ static LayoutDocumentTabItem()
 				new FrameworkPropertyMetadata(null, OnModelChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="Model"/> property.  This dependency property 
+		/// Gets or sets the <see cref="Model"/> property.  This dependency property
 		/// indicates the layout content model attached to the tab item.
 		/// </summary>
 		public LayoutContent Model
@@ -69,7 +72,7 @@ public LayoutContent Model
 		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="Model"/> property.</summary>
 		protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
 		{
-            var layoutItem = (Model?.Root?.Manager)?.GetLayoutItemFromModel(Model);
+			var layoutItem = (Model?.Root?.Manager)?.GetLayoutItemFromModel(Model);
 			SetLayoutItem(layoutItem);
 			if (layoutItem != null)
 				Model.TabItem = this;
@@ -87,13 +90,13 @@ protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
 		public static readonly DependencyProperty LayoutItemProperty = LayoutItemPropertyKey.DependencyProperty;
 
 		/// <summary>
-		/// Gets the <see cref="LayoutItem"/> property. This dependency property 
+		/// Gets the <see cref="LayoutItem"/> property. This dependency property
 		/// indicates the LayoutItem attached to this tag item.
 		/// </summary>
 		public LayoutItem LayoutItem => (LayoutItem)GetValue(LayoutItemProperty);
 
 		/// <summary>
-		/// Provides a secure method for setting the <see cref="LayoutItem"/> property.  
+		/// Provides a secure method for setting the <see cref="LayoutItem"/> property.
 		/// This dependency property indicates the LayoutItem attached to this tag item.
 		/// </summary>
 		/// <param name="value">The new value for the property.</param>
@@ -217,4 +220,4 @@ private void StartDraggingFloatingWindowForContent()
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutFloatingWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutFloatingWindowControl.cs
index e2d538c2..c7ff460e 100644
--- a/source/Components/AvalonDock/Controls/LayoutFloatingWindowControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutFloatingWindowControl.cs
@@ -7,731 +7,727 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
+using AvalonDock.Themes;
 using System;
 using System.ComponentModel;
 using System.Linq;
-using System.Windows;
 using System.Runtime.InteropServices;
-using System.Windows.Interop;
-using System.Windows.Input;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using System.Windows.Media;
-using AvalonDock.Layout;
 using System.Windows.Documents;
-using AvalonDock.Themes;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
 
 namespace AvalonDock.Controls
 {
-    /// <inheritdoc cref="Window"/>
-    /// <inheritdoc cref="ILayoutControl"/>
-    /// <summary>
-    /// Implements an abstraction layer for floating windows that can host other controls
-    /// (eg. documents and/or <see cref="LayoutAnchorable"/>).
-    /// 
-    /// A floating window can be dragged around independently of the <see cref="DockingManager"/>.
-    /// </summary>
-    /// <seealso cref="Window"/>
-    /// <seealso cref="ILayoutControl"/>
-    public abstract class LayoutFloatingWindowControl : Window, ILayoutControl
-    {
-        #region fields
-        private ResourceDictionary currentThemeResourceDictionary; // = null
-        private bool _isInternalChange; //false
-        private readonly ILayoutElement _model;
-        private bool _attachDrag = false;
-        private HwndSource _hwndSrc;
-        private HwndSourceHook _hwndSrcHook;
-        private DragService _dragService = null;
-        private bool _internalCloseFlag = false;
-        private bool _isClosing = false;
-
-        /// <summary>
-        /// Is false until the margins have been found once.
-        /// </summary>
-        /// <see cref="TotalMargin"/>
-        private bool _isTotalMarginSet = false;
-        #endregion fields
-
-        #region Constructors
-
-        static LayoutFloatingWindowControl()
-        {
-            AllowsTransparencyProperty.OverrideMetadata(typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(false));
-            ContentProperty.OverrideMetadata(typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(null, null, CoerceContentValue));
-            ShowInTaskbarProperty.OverrideMetadata(typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(false));
-            WindowStyleProperty.OverrideMetadata(typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(WindowStyle.None));
-        }
-
-        protected LayoutFloatingWindowControl(ILayoutElement model)
-        {
-            Loaded += OnLoaded;
-            Unloaded += OnUnloaded;
-            Closing += OnClosing;
-            SizeChanged += OnSizeChanged;
-            _model = model;
-        }
-
-        protected LayoutFloatingWindowControl(ILayoutElement model, bool isContentImmutable)
-          : this(model)
-        {
-            IsContentImmutable = isContentImmutable;
-        }
-
-        #endregion Constructors
-
-        #region Properties
-        /// <summary>
-        /// Gets/Sets the X,Y delta between the element being dragged and the
-        /// mouse position. The value of this property is used during the drag
-        /// cycle to position the dragged item under the mouse pointer.
-        /// 
-        /// Set this property on initialization to ensure that
-        /// the delta between mouse and control being dragged
-        /// remains constant.
-        /// </summary>
-        internal Point DragDelta { get; set; }
-
-        public abstract ILayoutElement Model { get; }
-
-        #region IsContentImmutable
-
-        /// <summary> <see cref="IsContentImmutable"/> dependency property.</summary>
-        public static readonly DependencyProperty IsContentImmutableProperty = DependencyProperty.Register(nameof(IsContentImmutable), typeof(bool), typeof(LayoutFloatingWindowControl),
-                  new FrameworkPropertyMetadata(false));
-
-        /// <summary>
-        /// Gets/sets the <see cref="IsContentImmutable"/> property.  This dependency property 
-        /// indicates if the content can be modified.
-        /// </summary>
-        public bool IsContentImmutable
-        {
-            get => (bool)GetValue(IsContentImmutableProperty);
-            private set => SetValue(IsContentImmutableProperty, value);
-        }
-
-        #endregion IsContentImmutable
-
-        #region IsDragging
-
-        /// <summary><see cref="IsDragging"/> Read-Only dependency property.</summary>
-        private static readonly DependencyPropertyKey IsDraggingPropertyKey = DependencyProperty.RegisterReadOnly(nameof(IsDragging), typeof(bool), typeof(LayoutFloatingWindowControl),
-                new FrameworkPropertyMetadata(false, OnIsDraggingChanged));
-
-        public static readonly DependencyProperty IsDraggingProperty = IsDraggingPropertyKey.DependencyProperty;
-
-        /// <summary>
-        /// Gets the <see cref="IsDragging"/> property. This dependency property 
-        /// indicates that this floating window is being dragged.
-        /// </summary>
-        public bool IsDragging => (bool)GetValue(IsDraggingProperty);
-
-        /// <summary>
-        /// Provides a secure method for setting the <see cref="IsDragging"/> property.  
-        /// This dependency property indicates that this floating window is being dragged.
-        /// </summary>
-        /// <param name="value">The new value for the property.</param>
-        protected void SetIsDragging(bool value) => SetValue(IsDraggingPropertyKey, value);
-
-        /// <summary>Handles changes to the <see cref="IsDragging"/> property.</summary>
-        private static void OnIsDraggingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutFloatingWindowControl)d).OnIsDraggingChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="IsDragging"/> property.</summary>
-        protected virtual void OnIsDraggingChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if ((bool)e.NewValue)
-                CaptureMouse();
-            else
-                ReleaseMouseCapture();
-        }
-
-        #endregion IsDragging
-
-        #region CloseInitiatedByUser
-
-        protected bool CloseInitiatedByUser => !_internalCloseFlag;
-
-        #endregion CloseInitiatedByUser
-
-        internal bool KeepContentVisibleOnClose { get; set; }
-
-        #region IsMaximized
-
-        /// <summary><see cref="IsMaximized"/> dependency property.</summary>
-        public static readonly DependencyProperty IsMaximizedProperty = DependencyProperty.Register(nameof(IsMaximized), typeof(bool), typeof(LayoutFloatingWindowControl),
-                  new FrameworkPropertyMetadata(false));
-
-        /// <summary>Gets/sets the <see cref="IsMaximized"/> property. This dependency property indicates if the window is maximized.</summary>
-        /// <remarks>Provides a secure method for setting the <see cref="IsMaximized"/> property.</remarks>
-        public bool IsMaximized
-        {
-            get => (bool)GetValue(IsMaximizedProperty);
-            private set
-            {
-                SetValue(IsMaximizedProperty, value);
-                UpdatePositionAndSizeOfPanes();
-            }
-        }
-
-        /// <inheritdoc />
-        protected override void OnStateChanged(EventArgs e)
-        {
-            if (!_isInternalChange)
-                UpdateMaximizedState(WindowState == WindowState.Maximized);
-
-            base.OnStateChanged(e);
-        }
-
-        #endregion IsMaximized
-
-        #region TotalMargin
-
-        private static readonly DependencyPropertyKey TotalMarginPropertyKey =
-            DependencyProperty.RegisterReadOnly(nameof(TotalMargin),
-                typeof(Thickness),
-                typeof(LayoutFloatingWindowControl),
-                new FrameworkPropertyMetadata(default(Thickness)));
+	/// <inheritdoc cref="Window"/>
+	/// <inheritdoc cref="ILayoutControl"/>
+	/// <summary>
+	/// Implements an abstraction layer for floating windows that can host other controls
+	/// (eg. documents and/or <see cref="LayoutAnchorable"/>).
+	///
+	/// A floating window can be dragged around independently of the <see cref="DockingManager"/>.
+	/// </summary>
+	/// <seealso cref="Window"/>
+	/// <seealso cref="ILayoutControl"/>
+	public abstract class LayoutFloatingWindowControl : Window, ILayoutControl
+	{
+		#region fields
+
+		private bool _isInternalChange; //false
+		private readonly ILayoutElement _model;
+		private bool _attachDrag = false;
+		private HwndSource _hwndSrc;
+		private HwndSourceHook _hwndSrcHook;
+		private DragService _dragService = null;
+		private bool _internalCloseFlag = false;
+		private bool _isClosing = false;
+
+		/// <summary>
+		/// Is false until the margins have been found once.
+		/// </summary>
+		/// <see cref="TotalMargin"/>
+		private bool _isTotalMarginSet = false;
+
+		#endregion fields
+
+		#region Constructors
+
+		static LayoutFloatingWindowControl()
+		{
+			AllowsTransparencyProperty.OverrideMetadata(typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(false));
+			ContentProperty.OverrideMetadata(typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(null, null, CoerceContentValue));
+			ShowInTaskbarProperty.OverrideMetadata(typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(false));
+			WindowStyleProperty.OverrideMetadata(typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(WindowStyle.None));
+		}
+
+		protected LayoutFloatingWindowControl(ILayoutElement model)
+		{
+			Loaded += OnLoaded;
+			Unloaded += OnUnloaded;
+			Closing += OnClosing;
+			SizeChanged += OnSizeChanged;
+			_model = model;
+		}
+
+		protected LayoutFloatingWindowControl(ILayoutElement model, bool isContentImmutable)
+		  : this(model)
+		{
+			IsContentImmutable = isContentImmutable;
+		}
+
+		#endregion Constructors
+
+		#region Properties
+
+		/// <summary>
+		/// Gets/Sets the X,Y delta between the element being dragged and the
+		/// mouse position. The value of this property is used during the drag
+		/// cycle to position the dragged item under the mouse pointer.
+		///
+		/// Set this property on initialization to ensure that
+		/// the delta between mouse and control being dragged
+		/// remains constant.
+		/// </summary>
+		internal Point DragDelta { get; set; }
+
+		public abstract ILayoutElement Model { get; }
+
+		#region IsContentImmutable
+
+		/// <summary> <see cref="IsContentImmutable"/> dependency property.</summary>
+		public static readonly DependencyProperty IsContentImmutableProperty = DependencyProperty.Register(nameof(IsContentImmutable), typeof(bool), typeof(LayoutFloatingWindowControl),
+				  new FrameworkPropertyMetadata(false));
+
+		/// <summary>
+		/// Gets/sets the <see cref="IsContentImmutable"/> property.  This dependency property
+		/// indicates if the content can be modified.
+		/// </summary>
+		public bool IsContentImmutable
+		{
+			get => (bool)GetValue(IsContentImmutableProperty);
+			private set => SetValue(IsContentImmutableProperty, value);
+		}
+
+		#endregion IsContentImmutable
+
+		#region IsDragging
+
+		/// <summary><see cref="IsDragging"/> Read-Only dependency property.</summary>
+		private static readonly DependencyPropertyKey IsDraggingPropertyKey = DependencyProperty.RegisterReadOnly(nameof(IsDragging), typeof(bool), typeof(LayoutFloatingWindowControl),
+				new FrameworkPropertyMetadata(false, OnIsDraggingChanged));
+
+		public static readonly DependencyProperty IsDraggingProperty = IsDraggingPropertyKey.DependencyProperty;
+
+		/// <summary>
+		/// Gets the <see cref="IsDragging"/> property. This dependency property
+		/// indicates that this floating window is being dragged.
+		/// </summary>
+		public bool IsDragging => (bool)GetValue(IsDraggingProperty);
+
+		/// <summary>
+		/// Provides a secure method for setting the <see cref="IsDragging"/> property.
+		/// This dependency property indicates that this floating window is being dragged.
+		/// </summary>
+		/// <param name="value">The new value for the property.</param>
+		protected void SetIsDragging(bool value) => SetValue(IsDraggingPropertyKey, value);
+
+		/// <summary>Handles changes to the <see cref="IsDragging"/> property.</summary>
+		private static void OnIsDraggingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutFloatingWindowControl)d).OnIsDraggingChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="IsDragging"/> property.</summary>
+		protected virtual void OnIsDraggingChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if ((bool)e.NewValue)
+				CaptureMouse();
+			else
+				ReleaseMouseCapture();
+		}
+
+		#endregion IsDragging
+
+		#region CloseInitiatedByUser
+
+		protected bool CloseInitiatedByUser => !_internalCloseFlag;
+
+		#endregion CloseInitiatedByUser
+
+		internal bool KeepContentVisibleOnClose { get; set; }
+
+		#region IsMaximized
+
+		/// <summary><see cref="IsMaximized"/> dependency property.</summary>
+		public static readonly DependencyProperty IsMaximizedProperty = DependencyProperty.Register(nameof(IsMaximized), typeof(bool), typeof(LayoutFloatingWindowControl),
+				  new FrameworkPropertyMetadata(false));
+
+		/// <summary>Gets/sets the <see cref="IsMaximized"/> property. This dependency property indicates if the window is maximized.</summary>
+		/// <remarks>Provides a secure method for setting the <see cref="IsMaximized"/> property.</remarks>
+		public bool IsMaximized
+		{
+			get => (bool)GetValue(IsMaximizedProperty);
+			private set
+			{
+				SetValue(IsMaximizedProperty, value);
+				UpdatePositionAndSizeOfPanes();
+			}
+		}
+
+		/// <inheritdoc />
+		protected override void OnStateChanged(EventArgs e)
+		{
+			if (!_isInternalChange)
+				UpdateMaximizedState(WindowState == WindowState.Maximized);
+
+			base.OnStateChanged(e);
+		}
+
+		#endregion IsMaximized
+
+		#region TotalMargin
+
+		private static readonly DependencyPropertyKey TotalMarginPropertyKey =
+			DependencyProperty.RegisterReadOnly(nameof(TotalMargin),
+				typeof(Thickness),
+				typeof(LayoutFloatingWindowControl),
+				new FrameworkPropertyMetadata(default(Thickness)));
 
-        public static readonly DependencyProperty TotalMarginProperty = TotalMarginPropertyKey.DependencyProperty;
+		public static readonly DependencyProperty TotalMarginProperty = TotalMarginPropertyKey.DependencyProperty;
 
-        /// <summary>
-        /// The total margin (including window chrome and title bar).
-        /// 
-        /// The margin is queried from the visual tree the first time it is rendered, zero until the first call of FilterMessage(WM_ACTIVATE)
-        /// </summary>
+		/// <summary>
+		/// The total margin (including window chrome and title bar).
+		///
+		/// The margin is queried from the visual tree the first time it is rendered, zero until the first call of FilterMessage(WM_ACTIVATE)
+		/// </summary>
 		public Thickness TotalMargin
-        {
-            get { return (Thickness)GetValue(TotalMarginProperty); }
-            protected set { SetValue(TotalMarginPropertyKey, value); }
-        }
-
-        #endregion
-
-        #region ContentMinHeight
-        public static readonly DependencyPropertyKey ContentMinHeightPropertyKey = DependencyProperty.RegisterReadOnly(
-            nameof(ContentMinHeight), typeof(double), typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(0.0));
-
-        public static readonly DependencyProperty ContentMinHeightProperty =
-            ContentMinHeightPropertyKey.DependencyProperty;
-
-        /// <summary>
-        /// The MinHeight of the content of the window, will be 0 until the window has been rendered, or if the MinHeight is unset for the content
-        /// </summary>
-        public double ContentMinHeight
-        {
-            get { return (double)GetValue(ContentMinHeightProperty); }
-            set { SetValue(ContentMinHeightPropertyKey, value); }
-        }
-        #endregion
-
-        #region ContentMinWidth
-        public static readonly DependencyPropertyKey ContentMinWidthPropertyKey = DependencyProperty.RegisterReadOnly(
-            nameof(ContentMinWidth), typeof(double), typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(0.0));
-
-        public static readonly DependencyProperty ContentMinWidthProperty =
-            ContentMinWidthPropertyKey.DependencyProperty;
-
-        /// <summary>
-        /// The MinWidth ocf the content of the window, will be 0 until the window has been rendered, or if the MinWidth is unset for the content
-        /// </summary>
-        public double ContentMinWidth
-        {
-            get { return (double)GetValue(ContentMinWidthProperty); }
-            set { SetValue(ContentMinWidthPropertyKey, value); }
-        }
-        #endregion
-
-        #endregion Properties
-
-        #region Internal Methods
-
-        internal virtual void UpdateThemeResources(Theme oldTheme = null)
-        {
-            if (oldTheme != null)
-            {
-                if (oldTheme is DictionaryTheme)
-                {
-                    if (currentThemeResourceDictionary != null)
-                    {
-                        Resources.MergedDictionaries.Remove(currentThemeResourceDictionary);
-                        currentThemeResourceDictionary = null;
-                    }
-                }
-                else
-                {
-                    var resourceDictionaryToRemove =
-                        Resources.MergedDictionaries.FirstOrDefault(r => r.Source == oldTheme.GetResourceUri());
-                    if (resourceDictionaryToRemove != null)
-                        Resources.MergedDictionaries.Remove(
-                            resourceDictionaryToRemove);
-                }
-            }
-
-            var manager = _model.Root?.Manager;
-            if (manager?.Theme == null) return;
-            if (manager.Theme is DictionaryTheme dictionaryTheme)
-            {
-                currentThemeResourceDictionary = dictionaryTheme.ThemeResourceDictionary;
-                Resources.MergedDictionaries.Add(currentThemeResourceDictionary);
-            }
-            else
-                Resources.MergedDictionaries.Add(new ResourceDictionary { Source = manager.Theme.GetResourceUri() });
-        }
-
-        internal void AttachDrag(bool onActivated = true)
-        {
-            if (onActivated)
-            {
-                _attachDrag = true;
-                Activated += OnActivated;
-            }
-            else
-            {
-                var windowHandle = new WindowInteropHelper(this).Handle;
-                var lParam = new IntPtr(((int)Left & 0xFFFF) | ((int)Top << 16));
-                Win32Helper.SendMessage(windowHandle, Win32Helper.WM_NCLBUTTONDOWN, new IntPtr(Win32Helper.HT_CAPTION), lParam);
-            }
-        }
-
-        protected virtual IntPtr FilterMessage(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            handled = false;
-
-            switch (msg)
-            {
-                case Win32Helper.WM_ACTIVATE:
-                    if (((int)wParam & 0xFFFF) == Win32Helper.WA_INACTIVE)
-                    {
-                        if (lParam == this.GetParentWindowHandle())
-                        {
-                            Win32Helper.SetActiveWindow(_hwndSrc.Handle);
-                            handled = true;
-                        }
-                    }
-                    UpdateWindowsSizeBasedOnMinSize();
-
-                    break;
-                case Win32Helper.WM_EXITSIZEMOVE:
-                    UpdatePositionAndSizeOfPanes();
-
-                    if (_dragService != null)
-                    {
-                        var mousePosition = this.TransformToDeviceDPI(Win32Helper.GetMousePosition());
-                        _dragService.Drop(mousePosition, out var dropFlag);
-                        _dragService = null;
-                        SetIsDragging(false);
-                        if (dropFlag) InternalClose();
-                    }
-                    break;
-                case Win32Helper.WM_MOVING:
-                    {
-                        UpdateDragPosition();
-                        if (IsMaximized) UpdateMaximizedState(false);
-                    }
-                    break;
-                case Win32Helper.WM_LBUTTONUP: //set as handled right button click on title area (after showing context menu)
-                    if (_dragService != null && Mouse.LeftButton == MouseButtonState.Released)
-                    {
-                        _dragService.Abort();
-                        _dragService = null;
-                        SetIsDragging(false);
-                    }
-                    break;
-                case Win32Helper.WM_SYSCOMMAND:
-                    var command = (int)wParam & 0xFFF0;
-                    if (command == Win32Helper.SC_MAXIMIZE || command == Win32Helper.SC_RESTORE) UpdateMaximizedState(command == Win32Helper.SC_MAXIMIZE);
-                    break;
-            }
-            return IntPtr.Zero;
-        }
-
-        /// <summary>
-        /// Set the margins of the window control (including the borders of the floating window and the title bar).
-        /// The result will be stored in <code>_totalMargin</code>.
-        /// </summary>
-        /// <remarks>If the control is not loaded <code>_totalMargin</code> will not be set.</remarks>
-        private void UpdateMargins()
-        {
-            // The grid with window bar and content
-            var grid = this.GetChildrenRecursive()
-                .OfType<Grid>()
-                .FirstOrDefault(g => g.RowDefinitions.Count > 0);
-            ContentPresenter contentControl = this.GetChildrenRecursive()
-                .OfType<ContentPresenter>()
-                .FirstOrDefault(c => c.Content is LayoutContent);
-            if (contentControl == null)
-                return;
-            // The content control in the grid, this has a different tree to walk up
-            var layoutContent = (LayoutContent)contentControl.Content;
-            if (grid != null && layoutContent.Content is FrameworkElement content)
-            {
-                var parents = content.GetParents().ToArray();
-                var children = this.GetChildrenRecursive()
-                    .TakeWhile(c => c != grid)
-                    .ToArray();
-                var borders = children
-                    .OfType<Border>()
-                    .Concat(parents
-                        .OfType<Border>())
-                    .ToArray();
-                var controls = children
-                    .OfType<Control>()
-                    .Concat(parents
-                        .OfType<Control>())
-                    .ToArray();
-                var frameworkElements = children
-                    .OfType<FrameworkElement>()
-                    .Concat(parents
-                        .OfType<FrameworkElement>())
-                    .ToArray();
-                var padding = controls.Sum(b => b.Padding);
-                var border = borders.Sum(b => b.BorderThickness);
-                var margin = frameworkElements.Sum(f => f.Margin);
-                margin = margin.Add(padding).Add(border).Add(grid.Margin);
-                margin.Top = grid.RowDefinitions[0].MinHeight;
-                TotalMargin = margin;
-                _isTotalMarginSet = true;
-            }
-        }
-
-        /// <summary>
-        /// Update the floating window size based on the <code>MinHeight</code> and <code>MinWidth</code> of the content of the control.
-        /// </summary>
-        /// <remarks>This will only be run once, when the window is rendered the first time and <code>_totalMargin</code> is identified.</remarks>
-        private void UpdateWindowsSizeBasedOnMinSize()
-        {
-            if (!_isTotalMarginSet)
-            {
-                UpdateMargins();
-                if (_isTotalMarginSet)
-                {
-                    // The LayoutAnchorableControl is bound via the ContentPresenter, hence it is best to do below in code and not in a style
-                    // See https://github.com/Dirkster99/AvalonDock/pull/146#issuecomment-609974424
-                    var layoutContents = this.GetChildrenRecursive()
-                        .OfType<ContentPresenter>()
-                        .Select(c => c.Content)
-                        .OfType<LayoutContent>()
-                        .Select(lc => lc.Content);
-                    var contents = layoutContents.OfType<FrameworkElement>();
-                    foreach (var content in contents)
-                    {
-                        ContentMinHeight = Math.Max(content.MinHeight, ContentMinHeight);
-                        ContentMinWidth = Math.Max(content.MinWidth, ContentMinWidth);
-                        if ((this.Model?.Root?.Manager?.AutoWindowSizeWhenOpened).GetValueOrDefault())
-                        {
-                            var parent = content.GetParents()
-                                .OfType<FrameworkElement>()
-                                .FirstOrDefault();
-                            // StackPanels among others have an ActualHeight larger than visible, hence we check the parent control as well
-                            if (content.ActualHeight < content.MinHeight ||
-                                parent != null && parent.ActualHeight < content.MinHeight)
-                            {
-                                Height = content.MinHeight + TotalMargin.Top + TotalMargin.Bottom;
-                            }
-
-                            if (content.ActualWidth < content.MinWidth ||
-                                parent != null && parent.ActualWidth < content.MinWidth)
-                            {
-                                Width = content.MinWidth + TotalMargin.Left + TotalMargin.Right;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        internal void InternalClose(bool closeInitiatedByUser = false)
-        {
-            _internalCloseFlag = !closeInitiatedByUser;
-            if (_isClosing) return;
-            _isClosing = true;
-            Close();
-        }
-
-        #endregion Internal Methods
-
-        #region Overrides
-
-        /// <inheritdoc />
-        protected override void OnClosed(EventArgs e)
-        {
-            SizeChanged -= OnSizeChanged;
-            if (Content != null)
-            {
-                (Content as FloatingWindowContentHost)?.Dispose();
-                if (_hwndSrc != null)
-                {
-                    _hwndSrc.RemoveHook(_hwndSrcHook);
-                    _hwndSrc.Dispose();
-                    _hwndSrc = null;
-                }
-            }
-            base.OnClosed(e);
-        }
-
-        /// <inheritdoc />
-        protected override void OnInitialized(EventArgs e)
-        {
-            CommandBindings.Add(new CommandBinding(Microsoft.Windows.Shell.SystemCommands.CloseWindowCommand,
-                (s, args) => Microsoft.Windows.Shell.SystemCommands.CloseWindow((Window)args.Parameter)));
-            CommandBindings.Add(new CommandBinding(Microsoft.Windows.Shell.SystemCommands.MaximizeWindowCommand,
-                (s, args) => Microsoft.Windows.Shell.SystemCommands.MaximizeWindow((Window)args.Parameter)));
-            CommandBindings.Add(new CommandBinding(Microsoft.Windows.Shell.SystemCommands.MinimizeWindowCommand,
-                (s, args) => Microsoft.Windows.Shell.SystemCommands.MinimizeWindow((Window)args.Parameter)));
-            CommandBindings.Add(new CommandBinding(Microsoft.Windows.Shell.SystemCommands.RestoreWindowCommand,
-                (s, args) => Microsoft.Windows.Shell.SystemCommands.RestoreWindow((Window)args.Parameter)));
-            //Debug.Assert(this.Owner != null);
-            base.OnInitialized(e);
-        }
-
-        #endregion Overrides
-
-        #region Private Methods
-
-        private static object CoerceContentValue(DependencyObject sender, object content)
-        {
-            if (!(sender is LayoutFloatingWindowControl lfwc)) return null;
-            if (lfwc.IsLoaded && lfwc.IsContentImmutable) return lfwc.Content;
-            return new FloatingWindowContentHost((LayoutFloatingWindowControl)sender) { Content = content as UIElement };
-        }
-
-        private void OnLoaded(object sender, RoutedEventArgs e)
-        {
-            Loaded -= OnLoaded;
-            this.SetParentToMainWindowOf(Model.Root.Manager);
-            _hwndSrc = PresentationSource.FromDependencyObject(this) as HwndSource;
-            _hwndSrcHook = FilterMessage;
-            _hwndSrc.AddHook(_hwndSrcHook);
-            // Restore maximize state
-            var maximized = Model.Descendents().OfType<ILayoutElementForFloatingWindow>().Any(l => l.IsMaximized);
-            UpdateMaximizedState(maximized);
-        }
-
-        private void OnUnloaded(object sender, RoutedEventArgs e)
-        {
-            Unloaded -= OnUnloaded;
-            if (_hwndSrc == null) return;
-            _hwndSrc.RemoveHook(_hwndSrcHook);
-            InternalClose();
-        }
-
-        private void OnClosing(object sender, CancelEventArgs e)
-        {
-            Closing -= OnClosing;
-            // If this window was Closed not from InternalClose method,
-            // mark it as closing to avoid "InvalidOperationException: : Cannot set Visibility to Visible or call Show, ShowDialog,
-            // Close, or WindowInteropHelper.EnsureHandle while a Window is closing".
-            if (!_isClosing) _isClosing = true;
-        }
-
-        private void OnSizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            foreach (var posElement in Model.Descendents().OfType<ILayoutElementForFloatingWindow>())
-            {
-                posElement.FloatingWidth = ActualWidth;
-                posElement.FloatingHeight = ActualHeight;
-                posElement.RaiseFloatingPropertiesUpdated();
-            }
-        }
-
-        private void OnActivated(object sender, EventArgs e)
-        {
-            Activated -= OnActivated;
-
-            if (!_attachDrag || Mouse.LeftButton != MouseButtonState.Pressed) return;
-            var windowHandle = new WindowInteropHelper(this).Handle;
-            var mousePosition = this.PointToScreenDPI(Mouse.GetPosition(this));
-
-            // BugFix Issue #6
-            // This code is initializes the drag when content (document or toolwindow) is dragged
-            // A second chance back up plan if DragDelta is not set
-            if (DragDelta == default) DragDelta = new Point(3, 3);
-            Left = mousePosition.X - DragDelta.X;                 // BugFix Issue #6
-            Top = mousePosition.Y - DragDelta.Y;
-            _attachDrag = false;
-            var lParam = new IntPtr(((int)mousePosition.X & 0xFFFF) | ((int)mousePosition.Y << 16));
-            Win32Helper.SendMessage(windowHandle, Win32Helper.WM_NCLBUTTONDOWN, new IntPtr(Win32Helper.HT_CAPTION), lParam);
-        }
-
-        private void UpdatePositionAndSizeOfPanes()
-        {
-            foreach (var posElement in Model.Descendents().OfType<ILayoutElementForFloatingWindow>())
-            {
-                posElement.FloatingLeft = Left;
-                posElement.FloatingTop = Top;
-                posElement.FloatingWidth = Width;
-                posElement.FloatingHeight = Height;
-                posElement.RaiseFloatingPropertiesUpdated();
-            }
-        }
-
-        private void UpdateMaximizedState(bool isMaximized)
-        {
-            foreach (var posElement in Model.Descendents().OfType<ILayoutElementForFloatingWindow>())
-                posElement.IsMaximized = isMaximized;
-            IsMaximized = isMaximized;
-            _isInternalChange = true;
-            WindowState = isMaximized ? WindowState.Maximized : WindowState.Normal;
-            _isInternalChange = false;
-        }
-
-        private void UpdateDragPosition()
-        {
-            if (_dragService == null)
-            {
-                _dragService = new DragService(this);
-                SetIsDragging(true);
-            }
-            var mousePosition = this.TransformToDeviceDPI(Win32Helper.GetMousePosition());
-            _dragService.UpdateMouseLocation(mousePosition);
-        }
-
-        #endregion Private Methods
-
-        public virtual void EnableBindings()
-        {
-        }
-
-        public virtual void DisableBindings()
-        {
-        }
-
-        #region Internal Classes
-
-        protected internal class FloatingWindowContentHost : HwndHost
-        {
-            #region fields
-            private readonly LayoutFloatingWindowControl _owner;
-            private HwndSource _wpfContentHost = null;
-            private Border _rootPresenter = null;
-            private DockingManager _manager = null;
-            #endregion fields
-
-            #region Constructors
-
-            public FloatingWindowContentHost(LayoutFloatingWindowControl owner)
-            {
-                _owner = owner;
-                var binding = new Binding(nameof(SizeToContent)) { Source = _owner };
-                BindingOperations.SetBinding(this, SizeToContentProperty, binding);
-            }
-
-            #endregion Constructors
-
-            #region Properties
-
-            public Visual RootVisual => _rootPresenter;
-
-            #region Content
-
-            /// <summary><see cref="Content"/> dependency property. </summary>
-            public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(nameof(Content), typeof(UIElement), typeof(FloatingWindowContentHost),
-                    new FrameworkPropertyMetadata(null, OnContentChanged));
-
-            /// <summary>
-            /// Gets or sets the <see cref="Content"/> property.  This dependency property 
-            /// indicates ....
-            /// </summary>
-            public UIElement Content
-            {
-                get => (UIElement)GetValue(ContentProperty);
-                set => SetValue(ContentProperty, value);
-            }
-
-            /// <summary>Handles changes to the <see cref="Content"/> property.</summary>
-            private static void OnContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((FloatingWindowContentHost)d).OnContentChanged((UIElement)e.OldValue, (UIElement)e.NewValue);
-
-            /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="Content"/> property.</summary>
-            protected virtual void OnContentChanged(UIElement oldValue, UIElement newValue)
-            {
-                if (_rootPresenter != null) _rootPresenter.Child = Content;
-                if (oldValue is FrameworkElement oldContent) oldContent.SizeChanged -= Content_SizeChanged;
-                if (newValue is FrameworkElement newContent) newContent.SizeChanged += Content_SizeChanged;
-            }
-
-            #endregion Content
-
-            #region SizeToContent
-
-            /// <summary><see cref="SizeToContent"/> dependency property.</summary>
-            public static readonly DependencyProperty SizeToContentProperty = DependencyProperty.Register(nameof(SizeToContent), typeof(SizeToContent), typeof(FloatingWindowContentHost),
-                    new FrameworkPropertyMetadata(SizeToContent.Manual, OnSizeToContentChanged));
-
-            /// <summary>Gets or sets the <see cref="SizeToContent"/> property.</summary>
-            public SizeToContent SizeToContent
-            {
-                get => (SizeToContent)GetValue(SizeToContentProperty);
-                set => SetValue(SizeToContentProperty, value);
-            }
-
-            /// <summary>Handles changes to the <see cref="SizeToContent"/> property.</summary>
-            private static void OnSizeToContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((FloatingWindowContentHost)d).OnSizeToContentChanged((SizeToContent)e.OldValue, (SizeToContent)e.NewValue);
-
-            /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="SizeToContent"/> property.</summary>
-            protected virtual void OnSizeToContentChanged(SizeToContent oldValue, SizeToContent newValue)
-            {
-                if (_wpfContentHost != null) _wpfContentHost.SizeToContent = newValue;
-            }
-
-            #endregion SizeToContent
-
-            #endregion Properties
-
-            #region Overrides
-
-            /// <inheritdoc />
-            protected override HandleRef BuildWindowCore(HandleRef hwndParent)
-            {
-                _wpfContentHost = new HwndSource(new HwndSourceParameters
-                {
-                    ParentWindow = hwndParent.Handle,
-                    WindowStyle = Win32Helper.WS_CHILD | Win32Helper.WS_VISIBLE | Win32Helper.WS_CLIPSIBLINGS | Win32Helper.WS_CLIPCHILDREN,
-                    Width = 1,
-                    Height = 1,
-                    UsesPerPixelOpacity = true,
-                });
-
-                _rootPresenter = new Border { Child = new AdornerDecorator { Child = Content }, Focusable = true };
-                _rootPresenter.SetBinding(Border.BackgroundProperty, new Binding(nameof(Background)) { Source = _owner });
-                _wpfContentHost.RootVisual = _rootPresenter;
-                _manager = _owner.Model.Root.Manager;
-                _manager.InternalAddLogicalChild(_rootPresenter);
-                return new HandleRef(this, _wpfContentHost.Handle);
-            }
-
-            /// <inheritdoc />
-            protected override void DestroyWindowCore(HandleRef hwnd)
-            {
-                _manager.InternalRemoveLogicalChild(_rootPresenter);
-                if (_wpfContentHost == null) return;
-                _wpfContentHost.Dispose();
-                _wpfContentHost = null;
-            }
-
-            /// <inheritdoc />
-            protected override Size MeasureOverride(Size constraint)
-            {
-                if (Content == null) return base.MeasureOverride(constraint);
-                Content.Measure(constraint);
-                return Content.DesiredSize;
-            }
-
-            #endregion Overrides
-
-            #region Methods
-
-            /// <summary>
-            /// Content_SizeChanged event handler.
-            /// </summary>
-            private void Content_SizeChanged(object sender, SizeChangedEventArgs e)
-            {
-                InvalidateMeasure();
-                InvalidateArrange();
-            }
-
-            #endregion Methods
-        }
-
-        #endregion Internal Classes
-    }
-}
+		{
+			get { return (Thickness)GetValue(TotalMarginProperty); }
+			protected set { SetValue(TotalMarginPropertyKey, value); }
+		}
+
+		#endregion TotalMargin
+
+		#region ContentMinHeight
+
+		public static readonly DependencyPropertyKey ContentMinHeightPropertyKey = DependencyProperty.RegisterReadOnly(
+			nameof(ContentMinHeight), typeof(double), typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(0.0));
+
+		public static readonly DependencyProperty ContentMinHeightProperty =
+			ContentMinHeightPropertyKey.DependencyProperty;
+
+		/// <summary>
+		/// The MinHeight of the content of the window, will be 0 until the window has been rendered, or if the MinHeight is unset for the content
+		/// </summary>
+		public double ContentMinHeight
+		{
+			get { return (double)GetValue(ContentMinHeightProperty); }
+			set { SetValue(ContentMinHeightPropertyKey, value); }
+		}
+
+		#endregion ContentMinHeight
+
+		#region ContentMinWidth
+
+		public static readonly DependencyPropertyKey ContentMinWidthPropertyKey = DependencyProperty.RegisterReadOnly(
+			nameof(ContentMinWidth), typeof(double), typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(0.0));
+
+		public static readonly DependencyProperty ContentMinWidthProperty =
+			ContentMinWidthPropertyKey.DependencyProperty;
+
+		/// <summary>
+		/// The MinWidth ocf the content of the window, will be 0 until the window has been rendered, or if the MinWidth is unset for the content
+		/// </summary>
+		public double ContentMinWidth
+		{
+			get { return (double)GetValue(ContentMinWidthProperty); }
+			set { SetValue(ContentMinWidthPropertyKey, value); }
+		}
+
+		#endregion ContentMinWidth
+
+		#endregion Properties
+
+		#region Internal Methods
+
+		internal virtual void UpdateThemeResources(Theme oldTheme = null)
+		{
+			if (oldTheme != null)
+			{
+				var resourceDictionaryToRemove =
+					Resources.MergedDictionaries.FirstOrDefault(r => r.Source == oldTheme.GetResourceUri());
+				if (resourceDictionaryToRemove != null)
+					Resources.MergedDictionaries.Remove(
+						resourceDictionaryToRemove);
+			}
+
+			var manager = _model.Root?.Manager;
+			if (manager?.Theme == null) return;
+
+			Resources.MergedDictionaries.Add(new ResourceDictionary { Source = manager.Theme.GetResourceUri() });
+		}
+
+		internal void AttachDrag(bool onActivated = true)
+		{
+			if (onActivated)
+			{
+				_attachDrag = true;
+				Activated += OnActivated;
+			}
+			else
+			{
+				var windowHandle = new WindowInteropHelper(this).Handle;
+				var lParam = new IntPtr(((int)Left & 0xFFFF) | ((int)Top << 16));
+				Win32Helper.SendMessage(windowHandle, Win32Helper.WM_NCLBUTTONDOWN, new IntPtr(Win32Helper.HT_CAPTION), lParam);
+			}
+		}
+
+		protected virtual IntPtr FilterMessage(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+		{
+			handled = false;
+
+			switch (msg)
+			{
+				case Win32Helper.WM_ACTIVATE:
+					if (((int)wParam & 0xFFFF) == Win32Helper.WA_INACTIVE)
+					{
+						if (lParam == this.GetParentWindowHandle())
+						{
+							Win32Helper.SetActiveWindow(_hwndSrc.Handle);
+							handled = true;
+						}
+					}
+					UpdateWindowsSizeBasedOnMinSize();
+
+					break;
+
+				case Win32Helper.WM_EXITSIZEMOVE:
+					UpdatePositionAndSizeOfPanes();
+
+					if (_dragService != null)
+					{
+						var mousePosition = this.TransformToDeviceDPI(Win32Helper.GetMousePosition());
+						_dragService.Drop(mousePosition, out var dropFlag);
+						_dragService = null;
+						SetIsDragging(false);
+						if (dropFlag) InternalClose();
+					}
+					break;
+
+				case Win32Helper.WM_MOVING:
+					{
+						UpdateDragPosition();
+						if (IsMaximized) UpdateMaximizedState(false);
+					}
+					break;
+
+				case Win32Helper.WM_LBUTTONUP: //set as handled right button click on title area (after showing context menu)
+					if (_dragService != null && Mouse.LeftButton == MouseButtonState.Released)
+					{
+						_dragService.Abort();
+						_dragService = null;
+						SetIsDragging(false);
+					}
+					break;
+
+				case Win32Helper.WM_SYSCOMMAND:
+					var command = (int)wParam & 0xFFF0;
+					if (command == Win32Helper.SC_MAXIMIZE || command == Win32Helper.SC_RESTORE) UpdateMaximizedState(command == Win32Helper.SC_MAXIMIZE);
+					break;
+			}
+			return IntPtr.Zero;
+		}
+
+		/// <summary>
+		/// Set the margins of the window control (including the borders of the floating window and the title bar).
+		/// The result will be stored in <code>_totalMargin</code>.
+		/// </summary>
+		/// <remarks>If the control is not loaded <code>_totalMargin</code> will not be set.</remarks>
+		private void UpdateMargins()
+		{
+			// The grid with window bar and content
+			var grid = this.GetChildrenRecursive()
+				.OfType<Grid>()
+				.FirstOrDefault(g => g.RowDefinitions.Count > 0);
+			ContentPresenter contentControl = this.GetChildrenRecursive()
+				.OfType<ContentPresenter>()
+				.FirstOrDefault(c => c.Content is LayoutContent);
+			if (contentControl == null)
+				return;
+			// The content control in the grid, this has a different tree to walk up
+			var layoutContent = (LayoutContent)contentControl.Content;
+			if (grid != null && layoutContent.Content is FrameworkElement content)
+			{
+				var parents = content.GetParents().ToArray();
+				var children = this.GetChildrenRecursive()
+					.TakeWhile(c => c != grid)
+					.ToArray();
+				var borders = children
+					.OfType<Border>()
+					.Concat(parents
+						.OfType<Border>())
+					.ToArray();
+				var controls = children
+					.OfType<Control>()
+					.Concat(parents
+						.OfType<Control>())
+					.ToArray();
+				var frameworkElements = children
+					.OfType<FrameworkElement>()
+					.Concat(parents
+						.OfType<FrameworkElement>())
+					.ToArray();
+				var padding = controls.Sum(b => b.Padding);
+				var border = borders.Sum(b => b.BorderThickness);
+				var margin = frameworkElements.Sum(f => f.Margin);
+				margin = margin.Add(padding).Add(border).Add(grid.Margin);
+				margin.Top = grid.RowDefinitions[0].MinHeight;
+				TotalMargin = margin;
+				_isTotalMarginSet = true;
+			}
+		}
+
+		/// <summary>
+		/// Update the floating window size based on the <code>MinHeight</code> and <code>MinWidth</code> of the content of the control.
+		/// </summary>
+		/// <remarks>This will only be run once, when the window is rendered the first time and <code>_totalMargin</code> is identified.</remarks>
+		private void UpdateWindowsSizeBasedOnMinSize()
+		{
+			if (!_isTotalMarginSet)
+			{
+				UpdateMargins();
+				if (_isTotalMarginSet)
+				{
+					// The LayoutAnchorableControl is bound via the ContentPresenter, hence it is best to do below in code and not in a style
+					// See https://github.com/Dirkster99/AvalonDock/pull/146#issuecomment-609974424
+					var layoutContents = this.GetChildrenRecursive()
+						.OfType<ContentPresenter>()
+						.Select(c => c.Content)
+						.OfType<LayoutContent>()
+						.Select(lc => lc.Content);
+					var contents = layoutContents.OfType<FrameworkElement>();
+					foreach (var content in contents)
+					{
+						ContentMinHeight = Math.Max(content.MinHeight, ContentMinHeight);
+						ContentMinWidth = Math.Max(content.MinWidth, ContentMinWidth);
+						if ((this.Model?.Root?.Manager?.AutoWindowSizeWhenOpened).GetValueOrDefault())
+						{
+							var parent = content.GetParents()
+								.OfType<FrameworkElement>()
+								.FirstOrDefault();
+							// StackPanels among others have an ActualHeight larger than visible, hence we check the parent control as well
+							if (content.ActualHeight < content.MinHeight ||
+								parent != null && parent.ActualHeight < content.MinHeight)
+							{
+								Height = content.MinHeight + TotalMargin.Top + TotalMargin.Bottom;
+							}
+
+							if (content.ActualWidth < content.MinWidth ||
+								parent != null && parent.ActualWidth < content.MinWidth)
+							{
+								Width = content.MinWidth + TotalMargin.Left + TotalMargin.Right;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		internal void InternalClose(bool closeInitiatedByUser = false)
+		{
+			_internalCloseFlag = !closeInitiatedByUser;
+			if (_isClosing) return;
+			_isClosing = true;
+			Close();
+		}
+
+		#endregion Internal Methods
+
+		#region Overrides
+
+		/// <inheritdoc />
+		protected override void OnClosed(EventArgs e)
+		{
+			SizeChanged -= OnSizeChanged;
+			if (Content != null)
+			{
+				(Content as FloatingWindowContentHost)?.Dispose();
+				if (_hwndSrc != null)
+				{
+					_hwndSrc.RemoveHook(_hwndSrcHook);
+					_hwndSrc.Dispose();
+					_hwndSrc = null;
+				}
+			}
+			base.OnClosed(e);
+		}
+
+		/// <inheritdoc />
+		protected override void OnInitialized(EventArgs e)
+		{
+			CommandBindings.Add(new CommandBinding(Microsoft.Windows.Shell.SystemCommands.CloseWindowCommand,
+				(s, args) => Microsoft.Windows.Shell.SystemCommands.CloseWindow((Window)args.Parameter)));
+			CommandBindings.Add(new CommandBinding(Microsoft.Windows.Shell.SystemCommands.MaximizeWindowCommand,
+				(s, args) => Microsoft.Windows.Shell.SystemCommands.MaximizeWindow((Window)args.Parameter)));
+			CommandBindings.Add(new CommandBinding(Microsoft.Windows.Shell.SystemCommands.MinimizeWindowCommand,
+				(s, args) => Microsoft.Windows.Shell.SystemCommands.MinimizeWindow((Window)args.Parameter)));
+			CommandBindings.Add(new CommandBinding(Microsoft.Windows.Shell.SystemCommands.RestoreWindowCommand,
+				(s, args) => Microsoft.Windows.Shell.SystemCommands.RestoreWindow((Window)args.Parameter)));
+			//Debug.Assert(this.Owner != null);
+			base.OnInitialized(e);
+		}
+
+		#endregion Overrides
+
+		#region Private Methods
+
+		private static object CoerceContentValue(DependencyObject sender, object content)
+		{
+			if (!(sender is LayoutFloatingWindowControl lfwc)) return null;
+			if (lfwc.IsLoaded && lfwc.IsContentImmutable) return lfwc.Content;
+			return new FloatingWindowContentHost((LayoutFloatingWindowControl)sender) { Content = content as UIElement };
+		}
+
+		private void OnLoaded(object sender, RoutedEventArgs e)
+		{
+			Loaded -= OnLoaded;
+			this.SetParentToMainWindowOf(Model.Root.Manager);
+			_hwndSrc = PresentationSource.FromDependencyObject(this) as HwndSource;
+			_hwndSrcHook = FilterMessage;
+			_hwndSrc.AddHook(_hwndSrcHook);
+			// Restore maximize state
+			var maximized = Model.Descendents().OfType<ILayoutElementForFloatingWindow>().Any(l => l.IsMaximized);
+			UpdateMaximizedState(maximized);
+		}
+
+		private void OnUnloaded(object sender, RoutedEventArgs e)
+		{
+			Unloaded -= OnUnloaded;
+			if (_hwndSrc == null) return;
+			_hwndSrc.RemoveHook(_hwndSrcHook);
+			InternalClose();
+		}
+
+		private void OnClosing(object sender, CancelEventArgs e)
+		{
+			Closing -= OnClosing;
+			// If this window was Closed not from InternalClose method,
+			// mark it as closing to avoid "InvalidOperationException: : Cannot set Visibility to Visible or call Show, ShowDialog,
+			// Close, or WindowInteropHelper.EnsureHandle while a Window is closing".
+			if (!_isClosing) _isClosing = true;
+		}
+
+		private void OnSizeChanged(object sender, SizeChangedEventArgs e)
+		{
+			foreach (var posElement in Model.Descendents().OfType<ILayoutElementForFloatingWindow>())
+			{
+				posElement.FloatingWidth = ActualWidth;
+				posElement.FloatingHeight = ActualHeight;
+				posElement.RaiseFloatingPropertiesUpdated();
+			}
+		}
+
+		private void OnActivated(object sender, EventArgs e)
+		{
+			Activated -= OnActivated;
+
+			if (!_attachDrag || Mouse.LeftButton != MouseButtonState.Pressed) return;
+			var windowHandle = new WindowInteropHelper(this).Handle;
+			var mousePosition = this.PointToScreenDPI(Mouse.GetPosition(this));
+
+			// BugFix Issue #6
+			// This code is initializes the drag when content (document or toolwindow) is dragged
+			// A second chance back up plan if DragDelta is not set
+			if (DragDelta == default) DragDelta = new Point(3, 3);
+			Left = mousePosition.X - DragDelta.X;                 // BugFix Issue #6
+			Top = mousePosition.Y - DragDelta.Y;
+			_attachDrag = false;
+			var lParam = new IntPtr(((int)mousePosition.X & 0xFFFF) | ((int)mousePosition.Y << 16));
+			Win32Helper.SendMessage(windowHandle, Win32Helper.WM_NCLBUTTONDOWN, new IntPtr(Win32Helper.HT_CAPTION), lParam);
+		}
+
+		private void UpdatePositionAndSizeOfPanes()
+		{
+			foreach (var posElement in Model.Descendents().OfType<ILayoutElementForFloatingWindow>())
+			{
+				posElement.FloatingLeft = Left;
+				posElement.FloatingTop = Top;
+				posElement.FloatingWidth = Width;
+				posElement.FloatingHeight = Height;
+				posElement.RaiseFloatingPropertiesUpdated();
+			}
+		}
+
+		private void UpdateMaximizedState(bool isMaximized)
+		{
+			foreach (var posElement in Model.Descendents().OfType<ILayoutElementForFloatingWindow>())
+				posElement.IsMaximized = isMaximized;
+			IsMaximized = isMaximized;
+			_isInternalChange = true;
+			WindowState = isMaximized ? WindowState.Maximized : WindowState.Normal;
+			_isInternalChange = false;
+		}
+
+		private void UpdateDragPosition()
+		{
+			if (_dragService == null)
+			{
+				_dragService = new DragService(this);
+				SetIsDragging(true);
+			}
+			var mousePosition = this.TransformToDeviceDPI(Win32Helper.GetMousePosition());
+			_dragService.UpdateMouseLocation(mousePosition);
+		}
+
+		#endregion Private Methods
+
+		public virtual void EnableBindings()
+		{
+		}
+
+		public virtual void DisableBindings()
+		{
+		}
+
+		#region Internal Classes
+
+		protected internal class FloatingWindowContentHost : HwndHost
+		{
+			#region fields
+
+			private readonly LayoutFloatingWindowControl _owner;
+			private HwndSource _wpfContentHost = null;
+			private Border _rootPresenter = null;
+			private DockingManager _manager = null;
+
+			#endregion fields
+
+			#region Constructors
+
+			public FloatingWindowContentHost(LayoutFloatingWindowControl owner)
+			{
+				_owner = owner;
+				var binding = new Binding(nameof(SizeToContent)) { Source = _owner };
+				BindingOperations.SetBinding(this, SizeToContentProperty, binding);
+			}
+
+			#endregion Constructors
+
+			#region Properties
+
+			public Visual RootVisual => _rootPresenter;
+
+			#region Content
+
+			/// <summary><see cref="Content"/> dependency property. </summary>
+			public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(nameof(Content), typeof(UIElement), typeof(FloatingWindowContentHost),
+					new FrameworkPropertyMetadata(null, OnContentChanged));
+
+			/// <summary>
+			/// Gets or sets the <see cref="Content"/> property.  This dependency property
+			/// indicates ....
+			/// </summary>
+			public UIElement Content
+			{
+				get => (UIElement)GetValue(ContentProperty);
+				set => SetValue(ContentProperty, value);
+			}
+
+			/// <summary>Handles changes to the <see cref="Content"/> property.</summary>
+			private static void OnContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((FloatingWindowContentHost)d).OnContentChanged((UIElement)e.OldValue, (UIElement)e.NewValue);
+
+			/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="Content"/> property.</summary>
+			protected virtual void OnContentChanged(UIElement oldValue, UIElement newValue)
+			{
+				if (_rootPresenter != null) _rootPresenter.Child = Content;
+				if (oldValue is FrameworkElement oldContent) oldContent.SizeChanged -= Content_SizeChanged;
+				if (newValue is FrameworkElement newContent) newContent.SizeChanged += Content_SizeChanged;
+			}
+
+			#endregion Content
+
+			#region SizeToContent
+
+			/// <summary><see cref="SizeToContent"/> dependency property.</summary>
+			public static readonly DependencyProperty SizeToContentProperty = DependencyProperty.Register(nameof(SizeToContent), typeof(SizeToContent), typeof(FloatingWindowContentHost),
+					new FrameworkPropertyMetadata(SizeToContent.Manual, OnSizeToContentChanged));
+
+			/// <summary>Gets or sets the <see cref="SizeToContent"/> property.</summary>
+			public SizeToContent SizeToContent
+			{
+				get => (SizeToContent)GetValue(SizeToContentProperty);
+				set => SetValue(SizeToContentProperty, value);
+			}
+
+			/// <summary>Handles changes to the <see cref="SizeToContent"/> property.</summary>
+			private static void OnSizeToContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((FloatingWindowContentHost)d).OnSizeToContentChanged((SizeToContent)e.OldValue, (SizeToContent)e.NewValue);
+
+			/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="SizeToContent"/> property.</summary>
+			protected virtual void OnSizeToContentChanged(SizeToContent oldValue, SizeToContent newValue)
+			{
+				if (_wpfContentHost != null) _wpfContentHost.SizeToContent = newValue;
+			}
+
+			#endregion SizeToContent
+
+			#endregion Properties
+
+			#region Overrides
+
+			/// <inheritdoc />
+			protected override HandleRef BuildWindowCore(HandleRef hwndParent)
+			{
+				_wpfContentHost = new HwndSource(new HwndSourceParameters
+				{
+					ParentWindow = hwndParent.Handle,
+					WindowStyle = Win32Helper.WS_CHILD | Win32Helper.WS_VISIBLE | Win32Helper.WS_CLIPSIBLINGS | Win32Helper.WS_CLIPCHILDREN,
+					Width = 1,
+					Height = 1,
+					UsesPerPixelOpacity = true,
+				});
+
+				_rootPresenter = new Border { Child = new AdornerDecorator { Child = Content }, Focusable = true };
+				_rootPresenter.SetBinding(Border.BackgroundProperty, new Binding(nameof(Background)) { Source = _owner });
+				_wpfContentHost.RootVisual = _rootPresenter;
+				_manager = _owner.Model.Root.Manager;
+				_manager.InternalAddLogicalChild(_rootPresenter);
+				return new HandleRef(this, _wpfContentHost.Handle);
+			}
+
+			/// <inheritdoc />
+			protected override void DestroyWindowCore(HandleRef hwnd)
+			{
+				_manager.InternalRemoveLogicalChild(_rootPresenter);
+				if (_wpfContentHost == null) return;
+				_wpfContentHost.Dispose();
+				_wpfContentHost = null;
+			}
+
+			/// <inheritdoc />
+			protected override Size MeasureOverride(Size constraint)
+			{
+				if (Content == null) return base.MeasureOverride(constraint);
+				Content.Measure(constraint);
+				return Content.DesiredSize;
+			}
+
+			#endregion Overrides
+
+			#region Methods
+
+			/// <summary>
+			/// Content_SizeChanged event handler.
+			/// </summary>
+			private void Content_SizeChanged(object sender, SizeChangedEventArgs e)
+			{
+				InvalidateMeasure();
+				InvalidateArrange();
+			}
+
+			#endregion Methods
+		}
+
+		#endregion Internal Classes
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutGridControl.cs b/source/Components/AvalonDock/Controls/LayoutGridControl.cs
index dbd984a7..d38d89fd 100644
--- a/source/Components/AvalonDock/Controls/LayoutGridControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutGridControl.cs
@@ -7,14 +7,14 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using AvalonDock.Layout;
 using System.Windows.Threading;
 
 namespace AvalonDock.Controls
@@ -34,6 +34,7 @@ namespace AvalonDock.Controls
 	public abstract class LayoutGridControl<T> : Grid, ILayoutControl, IAdjustableSizeLayout where T : class, ILayoutPanelElement
 	{
 		#region fields
+
 		private readonly LayoutPositionableGroup<T> _model;
 		private readonly Orientation _orientation;
 		private bool _initialized;
@@ -42,9 +43,11 @@ public abstract class LayoutGridControl<T> : Grid, ILayoutControl, IAdjustableSi
 		private Border _resizerGhost = null;
 		private Window _resizerWindowHost = null;
 		private Vector _initialStartPoint;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>
 		/// Class constructor
 		/// </summary>
@@ -58,7 +61,7 @@ internal LayoutGridControl(LayoutPositionableGroup<T> model, Orientation orienta
 			Unloaded += OnUnloaded;
 		}
 
-		#endregion
+		#endregion Constructors
 
 		#region Properties
 
@@ -68,9 +71,10 @@ internal LayoutGridControl(LayoutPositionableGroup<T> model, Orientation orienta
 
 		private bool AsyncRefreshCalled => _asyncRefreshCalled != null;
 
-		#endregion
+		#endregion Properties
 
 		#region Overrides
+
 		/// <inheritdoc/>
 		protected override void OnInitialized(EventArgs e)
 		{
@@ -89,7 +93,7 @@ protected override void OnInitialized(EventArgs e)
 			this.SizeChanged += OnSizeChanged;
 		}
 
-		#endregion
+		#endregion Overrides
 
 		#region Internal Methods
 
@@ -101,7 +105,7 @@ protected void FixChildrenDockLengths()
 
 		protected abstract void OnFixChildrenDockLengths();
 
-		#endregion
+		#endregion Internal Methods
 
 		#region Private Methods
 
@@ -196,7 +200,9 @@ private void UpdateRowColDefinitions()
 			if (manager == null) return;
 			FixChildrenDockLengths();
 			//Debug.Assert(InternalChildren.Count == _model.ChildrenCount + (_model.ChildrenCount - 1));
+
 			#region Setup GridRows/Cols
+
 			RowDefinitions.Clear();
 			ColumnDefinitions.Clear();
 			if (Orientation == Orientation.Horizontal)
@@ -275,7 +281,7 @@ private void UpdateRowColDefinitions()
 				}
 			}
 
-			#endregion
+			#endregion Setup GridRows/Cols
 		}
 
 		private void CreateSplitters()
@@ -626,6 +632,6 @@ private void HideResizerOverlayWindow()
 			_resizerWindowHost = null;
 		}
 
-		#endregion
+		#endregion Private Methods
 	}
 }
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutGridResizerControl.cs b/source/Components/AvalonDock/Controls/LayoutGridResizerControl.cs
index 1fe97269..3de04721 100644
--- a/source/Components/AvalonDock/Controls/LayoutGridResizerControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutGridResizerControl.cs
@@ -7,8 +7,8 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
-using System.Windows.Controls.Primitives;
 using System.Windows;
+using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 
 namespace AvalonDock.Controls
@@ -76,4 +76,4 @@ public double OpacityWhileDragging
 
 		#endregion Properties
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutItem.cs b/source/Components/AvalonDock/Controls/LayoutItem.cs
index 749ad92c..71cea277 100644
--- a/source/Components/AvalonDock/Controls/LayoutItem.cs
+++ b/source/Components/AvalonDock/Controls/LayoutItem.cs
@@ -7,15 +7,15 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Commands;
+using AvalonDock.Layout;
 using System;
 using System.Linq;
 using System.Windows;
-using AvalonDock.Layout;
-using System.Windows.Input;
-using AvalonDock.Commands;
+using System.Windows.Controls;
 using System.Windows.Data;
+using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Controls;
 
 namespace AvalonDock.Controls
 {
@@ -28,6 +28,7 @@ namespace AvalonDock.Controls
 	public abstract class LayoutItem : FrameworkElement
 	{
 		#region fields
+
 		private ICommand _defaultCloseCommand;
 		private ICommand _defaultFloatCommand;
 		private ICommand _defaultDockAsDocumentCommand;
@@ -41,6 +42,7 @@ public abstract class LayoutItem : FrameworkElement
 		private ContentPresenter _view = null;
 		private readonly ReentrantFlag _isSelectedReentrantFlag = new ReentrantFlag();
 		private readonly ReentrantFlag _isActiveReentrantFlag = new ReentrantFlag();
+
 		#endregion fields
 
 		#region Constructors
@@ -55,7 +57,7 @@ internal LayoutItem()
 		{
 		}
 
-		#endregion
+		#endregion Constructors
 
 		#region Properties
 
@@ -63,13 +65,13 @@ internal LayoutItem()
 
 		public LayoutContent LayoutElement { get; private set; }
 
-		#endregion
+		#endregion LayoutElement
 
 		#region Model
 
 		public object Model { get; private set; }
 
-		#endregion
+		#endregion Model
 
 		#region View
 
@@ -88,7 +90,7 @@ public ContentPresenter View
 			}
 		}
 
-		#endregion
+		#endregion View
 
 		#region Title
 
@@ -97,7 +99,7 @@ public ContentPresenter View
 				new FrameworkPropertyMetadata(null, OnTitleChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="Title"/> property.  This dependency property 
+		/// Gets or sets the <see cref="Title"/> property.  This dependency property
 		/// indicates the title of the element.
 		/// </summary>
 		public string Title
@@ -115,7 +117,7 @@ protected virtual void OnTitleChanged(DependencyPropertyChangedEventArgs e)
 			if (LayoutElement != null) LayoutElement.Title = (string)e.NewValue;
 		}
 
-		#endregion
+		#endregion Title
 
 		#region IconSource
 
@@ -124,7 +126,7 @@ protected virtual void OnTitleChanged(DependencyPropertyChangedEventArgs e)
 				new FrameworkPropertyMetadata(null, OnIconSourceChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="IconSource"/> property. This dependency property 
+		/// Gets or sets the <see cref="IconSource"/> property. This dependency property
 		/// indicates icon associated with the item.
 		/// </summary>
 		public ImageSource IconSource
@@ -142,7 +144,7 @@ protected virtual void OnIconSourceChanged(DependencyPropertyChangedEventArgs e)
 			if (LayoutElement != null) LayoutElement.IconSource = IconSource;
 		}
 
-		#endregion
+		#endregion IconSource
 
 		#region ContentId
 
@@ -151,7 +153,7 @@ protected virtual void OnIconSourceChanged(DependencyPropertyChangedEventArgs e)
 				new FrameworkPropertyMetadata(null, OnContentIdChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="ContentId"/> property. This dependency property 
+		/// Gets or sets the <see cref="ContentId"/> property. This dependency property
 		/// indicates the content id used to retrieve content when deserializing layouts.
 		/// </summary>
 		public string ContentId
@@ -169,7 +171,7 @@ protected virtual void OnContentIdChanged(DependencyPropertyChangedEventArgs e)
 			if (LayoutElement != null) LayoutElement.ContentId = (string)e.NewValue;
 		}
 
-		#endregion
+		#endregion ContentId
 
 		#region IsSelected
 
@@ -178,7 +180,7 @@ protected virtual void OnContentIdChanged(DependencyPropertyChangedEventArgs e)
 				new FrameworkPropertyMetadata(false, OnIsSelectedChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="IsSelected"/> property. This dependency property 
+		/// Gets or sets the <see cref="IsSelected"/> property. This dependency property
 		/// indicates if the item is selected inside its container.
 		/// </summary>
 		public bool IsSelected
@@ -200,16 +202,16 @@ protected virtual void OnIsSelectedChanged(DependencyPropertyChangedEventArgs e)
 			}
 		}
 
-		#endregion
+		#endregion IsSelected
 
-		#region IsActive  
+		#region IsActive
 
 		/// <summary><see cref="IsActive"/> dependency property.</summary>
 		public static readonly DependencyProperty IsActiveProperty = DependencyProperty.Register(nameof(IsActive), typeof(bool), typeof(LayoutItem),
 				new FrameworkPropertyMetadata(false, OnIsActiveChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="IsActive"/> property.  This dependency property 
+		/// Gets or sets the <see cref="IsActive"/> property.  This dependency property
 		/// indicates if the item is active in the UI.
 		/// </summary>
 		public bool IsActive
@@ -231,7 +233,7 @@ protected virtual void OnIsActiveChanged(DependencyPropertyChangedEventArgs e)
 			}
 		}
 
-		#endregion
+		#endregion IsActive
 
 		#region CanClose
 
@@ -240,7 +242,7 @@ protected virtual void OnIsActiveChanged(DependencyPropertyChangedEventArgs e)
 				new FrameworkPropertyMetadata(true, OnCanCloseChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="CanClose"/> property. This dependency property 
+		/// Gets or sets the <see cref="CanClose"/> property. This dependency property
 		/// indicates if the item can be closed.
 		/// </summary>
 		public bool CanClose
@@ -258,7 +260,7 @@ protected virtual void OnCanCloseChanged(DependencyPropertyChangedEventArgs e)
 			if (LayoutElement != null) LayoutElement.CanClose = (bool)e.NewValue;
 		}
 
-		#endregion
+		#endregion CanClose
 
 		#region CanFloat
 
@@ -267,7 +269,7 @@ protected virtual void OnCanCloseChanged(DependencyPropertyChangedEventArgs e)
 				new FrameworkPropertyMetadata(true, OnCanFloatChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="CanFloat"/> property. This dependency property 
+		/// Gets or sets the <see cref="CanFloat"/> property. This dependency property
 		/// indicates if user can move the layout element dragging it to another position.
 		/// </summary>
 		public bool CanFloat
@@ -285,7 +287,7 @@ protected virtual void OnCanFloatChanged(DependencyPropertyChangedEventArgs e)
 			if (LayoutElement != null) LayoutElement.CanFloat = (bool)e.NewValue;
 		}
 
-		#endregion
+		#endregion CanFloat
 
 		#region CloseCommand
 
@@ -294,7 +296,7 @@ protected virtual void OnCanFloatChanged(DependencyPropertyChangedEventArgs e)
 				new FrameworkPropertyMetadata(null, OnCloseCommandChanged, CoerceCloseCommandValue));
 
 		/// <summary>
-		/// Gets or sets the <see cref="CloseCommand"/>  property. This dependency property 
+		/// Gets or sets the <see cref="CloseCommand"/>  property. This dependency property
 		/// indicates the command to execute when user click the document close button.
 		/// </summary>
 		public ICommand CloseCommand
@@ -320,9 +322,10 @@ protected virtual void OnCloseCommandChanged(DependencyPropertyChangedEventArgs
 
 		protected abstract void Close();
 
-		#endregion
+		#endregion CloseCommand
 
 		#region FloatCommand
+
 		/// <summary><see cref="FloatCommand"/> dependency property.</summary>
 		public static readonly DependencyProperty FloatCommandProperty = DependencyProperty.Register(nameof(FloatCommand), typeof(ICommand), typeof(LayoutItem),
 				new FrameworkPropertyMetadata(null, OnFloatCommandChanged, CoerceFloatCommandValue));
@@ -355,7 +358,7 @@ protected virtual void OnFloatCommandChanged(DependencyPropertyChangedEventArgs
 		/// <param name="parameter"></param>
 		private void ExecuteFloatCommand(object parameter) => LayoutElement.Root.Manager.ExecuteFloatCommand(LayoutElement);
 
-		#endregion
+		#endregion FloatCommand
 
 		#region DockAsDocumentCommand
 
@@ -364,7 +367,7 @@ protected virtual void OnFloatCommandChanged(DependencyPropertyChangedEventArgs
 				new FrameworkPropertyMetadata(null, OnDockAsDocumentCommandChanged, CoerceDockAsDocumentCommandValue));
 
 		/// <summary>
-		/// Gets or sets the <see cref="DockAsDocumentCommand"/> property. This dependency property 
+		/// Gets or sets the <see cref="DockAsDocumentCommand"/> property. This dependency property
 		/// indicates the command to execute when user click the DockAsDocument button.
 		/// </summary>
 		/// <remarks>By default this command move the anchorable inside the last focused document pane.</remarks>
@@ -391,7 +394,7 @@ protected virtual void OnDockAsDocumentCommandChanged(DependencyPropertyChangedE
 
 		private void ExecuteDockAsDocumentCommand(object parameter) => LayoutElement.Root.Manager.ExecuteDockAsDocumentCommand(LayoutElement);
 
-		#endregion
+		#endregion DockAsDocumentCommand
 
 		#region CloseAllButThisCommand
 
@@ -400,7 +403,7 @@ protected virtual void OnDockAsDocumentCommandChanged(DependencyPropertyChangedE
 				new FrameworkPropertyMetadata(null, OnCloseAllButThisCommandChanged, CoerceCloseAllButThisCommandValue));
 
 		/// <summary>
-		/// Gets or sets the <see cref="CloseAllButThisCommand"/> property.  This dependency property 
+		/// Gets or sets the <see cref="CloseAllButThisCommand"/> property.  This dependency property
 		/// indicates the 'Close All But This' command.
 		/// </summary>
 		public ICommand CloseAllButThisCommand
@@ -429,7 +432,7 @@ private bool CanExecuteCloseAllButThisCommand(object parameter)
 
 		private void ExecuteCloseAllButThisCommand(object parameter) => LayoutElement.Root.Manager.ExecuteCloseAllButThisCommand(LayoutElement);
 
-		#endregion
+		#endregion CloseAllButThisCommand
 
 		#region CloseAllCommand
 
@@ -464,7 +467,7 @@ private bool CanExecuteCloseAllCommand(object parameter)
 
 		private void ExecuteCloseAllCommand(object parameter) => LayoutElement.Root.Manager.ExecuteCloseAllCommand(LayoutElement);
 
-		#endregion
+		#endregion CloseAllCommand
 
 		#region ActivateCommand
 
@@ -473,7 +476,7 @@ private bool CanExecuteCloseAllCommand(object parameter)
 				new FrameworkPropertyMetadata(null, OnActivateCommandChanged, CoerceActivateCommandValue));
 
 		/// <summary>
-		/// Gets or sets the <see cref="ActivateCommand"/> property. This dependency property 
+		/// Gets or sets the <see cref="ActivateCommand"/> property. This dependency property
 		/// indicates the command to execute when user wants to activate a content (either a Document or an Anchorable).
 		/// </summary>
 		public ICommand ActivateCommand
@@ -497,7 +500,7 @@ protected virtual void OnActivateCommandChanged(DependencyPropertyChangedEventAr
 
 		private void ExecuteActivateCommand(object parameter) => LayoutElement.Root.Manager.ExecuteContentActivateCommand(LayoutElement);
 
-		#endregion
+		#endregion ActivateCommand
 
 		#region NewVerticalTabGroupCommand
 
@@ -506,7 +509,7 @@ protected virtual void OnActivateCommandChanged(DependencyPropertyChangedEventAr
 				new FrameworkPropertyMetadata(null, OnNewVerticalTabGroupCommandChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="NewVerticalTabGroupCommand"/> property. This dependency property 
+		/// Gets or sets the <see cref="NewVerticalTabGroupCommand"/> property. This dependency property
 		/// indicates the new vertical tab group command.
 		/// </summary>
 		public ICommand NewVerticalTabGroupCommand
@@ -555,7 +558,8 @@ private void ExecuteNewVerticalTabGroupCommand(object parameter)
 			layoutElement.IsActive = true;
 			layoutElement.Root.CollectGarbage();
 		}
-		#endregion
+
+		#endregion NewVerticalTabGroupCommand
 
 		#region NewHorizontalTabGroupCommand
 
@@ -564,7 +568,7 @@ private void ExecuteNewVerticalTabGroupCommand(object parameter)
 				new FrameworkPropertyMetadata(null, OnNewHorizontalTabGroupCommandChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="NewHorizontalTabGroupCommand"/> property. This dependency property 
+		/// Gets or sets the <see cref="NewHorizontalTabGroupCommand"/> property. This dependency property
 		/// indicates the new horizontal tab group command.
 		/// </summary>
 		public ICommand NewHorizontalTabGroupCommand
@@ -613,7 +617,8 @@ private void ExecuteNewHorizontalTabGroupCommand(object parameter)
 			layoutElement.IsActive = true;
 			layoutElement.Root.CollectGarbage();
 		}
-		#endregion
+
+		#endregion NewHorizontalTabGroupCommand
 
 		#region MoveToNextTabGroupCommand
 
@@ -622,7 +627,7 @@ private void ExecuteNewHorizontalTabGroupCommand(object parameter)
 				new FrameworkPropertyMetadata(null, OnMoveToNextTabGroupCommandChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="MoveToNextTabGroupCommand"/> property. This dependency property 
+		/// Gets or sets the <see cref="MoveToNextTabGroupCommand"/> property. This dependency property
 		/// indicates move to next tab group command.
 		/// </summary>
 		public ICommand MoveToNextTabGroupCommand
@@ -662,7 +667,7 @@ private void ExecuteMoveToNextTabGroupCommand(object parameter)
 			layoutElement.Root.CollectGarbage();
 		}
 
-		#endregion
+		#endregion MoveToNextTabGroupCommand
 
 		#region MoveToPreviousTabGroupCommand
 
@@ -671,7 +676,7 @@ private void ExecuteMoveToNextTabGroupCommand(object parameter)
 				new FrameworkPropertyMetadata(null, OnMoveToPreviousTabGroupCommandChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="MoveToPreviousTabGroupCommand"/> property. This dependency property 
+		/// Gets or sets the <see cref="MoveToPreviousTabGroupCommand"/> property. This dependency property
 		/// indicates move to previous tab group command.
 		/// </summary>
 		public ICommand MoveToPreviousTabGroupCommand
@@ -710,9 +715,10 @@ private void ExecuteMoveToPreviousTabGroupCommand(object parameter)
 			layoutElement.IsActive = true;
 			layoutElement.Root.CollectGarbage();
 		}
-		#endregion
 
-		#endregion
+		#endregion MoveToPreviousTabGroupCommand
+
+		#endregion Properties
 
 		#region Internal Methods
 
@@ -777,7 +783,6 @@ protected virtual void SetDefaultBindings()
 			if (MoveToPreviousTabGroupCommand == null)
 				MoveToPreviousTabGroupCommand = _defaultMoveToPreviousTabGroupCommand;
 
-
 			IsSelected = LayoutElement.IsSelected;
 			IsActive = LayoutElement.IsActive;
 			CanClose = LayoutElement.CanClose;
@@ -813,7 +818,7 @@ internal virtual void Detach()
 
 		internal bool IsViewExists() => _view != null;
 
-		#endregion
+		#endregion Internal Methods
 
 		#region Private Methods
 
@@ -846,6 +851,6 @@ private void OnToolTipChanged()
 
 		private static void OnVisibilityChanged(DependencyObject s, DependencyPropertyChangedEventArgs e) => ((LayoutItem)s).OnVisibilityChanged();
 
-		#endregion
+		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/LayoutPanelControl.cs b/source/Components/AvalonDock/Controls/LayoutPanelControl.cs
index 968bd59a..4744f786 100644
--- a/source/Components/AvalonDock/Controls/LayoutPanelControl.cs
+++ b/source/Components/AvalonDock/Controls/LayoutPanelControl.cs
@@ -7,10 +7,10 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
-using System.Windows.Controls;
 using System.Windows;
-using AvalonDock.Layout;
+using System.Windows.Controls;
 
 namespace AvalonDock.Controls
 {
@@ -21,7 +21,9 @@ namespace AvalonDock.Controls
 	public class LayoutPanelControl : LayoutGridControl<ILayoutPanelElement>, ILayoutControl
 	{
 		#region fields
+
 		private readonly LayoutPanel _model;
+
 		#endregion fields
 
 		#region Constructors
@@ -30,10 +32,9 @@ internal LayoutPanelControl(LayoutPanel model)
 			: base(model, model.Orientation)
 		{
 			_model = model;
-
 		}
 
-		#endregion
+		#endregion Constructors
 
 		#region Overrides
 
@@ -41,19 +42,20 @@ protected override void OnFixChildrenDockLengths()
 		{
 			if (ActualWidth == 0.0 || ActualHeight == 0.0) return;
 
-            #region Setup DockWidth/Height for children
-            if (_model.Orientation == Orientation.Horizontal)
+			#region Setup DockWidth/Height for children
+
+			if (_model.Orientation == Orientation.Horizontal)
 			{
 				if (_model.ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>())
 				{
 					for (var i = 0; i < _model.Children.Count; i++)
 					{
-                        if (_model.Children[i] as ILayoutContainer != null &&
+						if (_model.Children[i] as ILayoutContainer != null &&
 							((_model.Children[i] as ILayoutContainer).IsOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>() ||
-                             (_model.Children[i] as ILayoutContainer).ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>()))
+							 (_model.Children[i] as ILayoutContainer).ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>()))
 						{
 							// Keep set values (from XML for instance)
-							if(!(_model.Children[i] as ILayoutPositionableElement).DockWidth.IsStar) (_model.Children[i] as ILayoutPositionableElement).DockWidth = new GridLength(1.0, GridUnitType.Star);
+							if (!(_model.Children[i] as ILayoutPositionableElement).DockWidth.IsStar) (_model.Children[i] as ILayoutPositionableElement).DockWidth = new GridLength(1.0, GridUnitType.Star);
 						}
 						else if (_model.Children[i] as ILayoutPositionableElement != null && (_model.Children[i] as ILayoutPositionableElement).DockWidth.IsStar)
 						{
@@ -63,7 +65,7 @@ protected override void OnFixChildrenDockLengths()
 
 							widthToSet = Math.Min(widthToSet, ActualWidth / 2.0);
 							widthToSet = Math.Max(widthToSet, childDockMinWidth);
-                            (_model.Children[i] as ILayoutPositionableElement).DockWidth = new GridLength(widthToSet, GridUnitType.Pixel);
+							(_model.Children[i] as ILayoutPositionableElement).DockWidth = new GridLength(widthToSet, GridUnitType.Pixel);
 						}
 					}
 				}
@@ -75,7 +77,7 @@ protected override void OnFixChildrenDockLengths()
 						if (!childPositionableModel.DockWidth.IsStar)
 						{
 							// Keep set values (from XML for instance)
-							if(!childPositionableModel.DockWidth.IsStar) childPositionableModel.DockWidth = new GridLength(1.0, GridUnitType.Star);
+							if (!childPositionableModel.DockWidth.IsStar) childPositionableModel.DockWidth = new GridLength(1.0, GridUnitType.Star);
 						}
 					}
 				}
@@ -86,12 +88,12 @@ protected override void OnFixChildrenDockLengths()
 				{
 					for (var i = 0; i < _model.Children.Count; i++)
 					{
-                        if (_model.Children[i] is ILayoutContainer childContainerModel &&
+						if (_model.Children[i] is ILayoutContainer childContainerModel &&
 							(childContainerModel.IsOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>() ||
 							 childContainerModel.ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>()))
 						{
 							// Keep set values (from XML for instance)
-							if(!(_model.Children[i] as ILayoutPositionableElement).DockHeight.IsStar) (_model.Children[i] as ILayoutPositionableElement).DockHeight = new GridLength(1.0, GridUnitType.Star);
+							if (!(_model.Children[i] as ILayoutPositionableElement).DockHeight.IsStar) (_model.Children[i] as ILayoutPositionableElement).DockHeight = new GridLength(1.0, GridUnitType.Star);
 						}
 						else if (_model.Children[i] as ILayoutPositionableElement != null && (_model.Children[i] as ILayoutPositionableElement).DockHeight.IsStar)
 						{
@@ -100,7 +102,7 @@ protected override void OnFixChildrenDockLengths()
 							var heightToSet = Math.Max(childPositionableModelWidthActualSize.ActualHeight, childDockMinHeight);
 							heightToSet = Math.Min(heightToSet, ActualHeight / 2.0);
 							heightToSet = Math.Max(heightToSet, childDockMinHeight);
-                            (_model.Children[i] as ILayoutPositionableElement).DockHeight = new GridLength(heightToSet, GridUnitType.Pixel);
+							(_model.Children[i] as ILayoutPositionableElement).DockHeight = new GridLength(heightToSet, GridUnitType.Pixel);
 						}
 					}
 				}
@@ -112,14 +114,15 @@ protected override void OnFixChildrenDockLengths()
 						if (!childPositionableModel.DockHeight.IsStar)
 						{
 							// Keep set values (from XML for instance)
-							if(!childPositionableModel.DockHeight.IsStar) childPositionableModel.DockHeight = new GridLength(1.0, GridUnitType.Star);
+							if (!childPositionableModel.DockHeight.IsStar) childPositionableModel.DockHeight = new GridLength(1.0, GridUnitType.Star);
 						}
 					}
 				}
 			}
-			#endregion
+
+			#endregion Setup DockWidth/Height for children
 		}
 
-		#endregion
+		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/MenuItemEx.cs b/source/Components/AvalonDock/Controls/MenuItemEx.cs
index 5afda46f..d8024496 100644
--- a/source/Components/AvalonDock/Controls/MenuItemEx.cs
+++ b/source/Components/AvalonDock/Controls/MenuItemEx.cs
@@ -7,8 +7,8 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace AvalonDock.Controls
 {
@@ -21,7 +21,9 @@ namespace AvalonDock.Controls
 	public class MenuItemEx : MenuItem
 	{
 		#region fields
+
 		private bool _reentrantFlag = false;
+
 		#endregion fields
 
 		#region Constructors
@@ -31,7 +33,7 @@ static MenuItemEx()
 			IconProperty.OverrideMetadata(typeof(MenuItemEx), new FrameworkPropertyMetadata(OnIconPropertyChanged));
 		}
 
-		#endregion
+		#endregion Constructors
 
 		#region Properties
 
@@ -42,7 +44,7 @@ static MenuItemEx()
 				new FrameworkPropertyMetadata(null, OnIconTemplateChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="IconTemplate "/> property. This dependency property 
+		/// Gets or sets the <see cref="IconTemplate "/> property. This dependency property
 		/// indicates the data template for the icon.
 		/// </summary>
 		public DataTemplate IconTemplate
@@ -57,7 +59,7 @@ public DataTemplate IconTemplate
 		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="IconTemplate "/> property.</summary>
 		protected virtual void OnIconTemplateChanged(DependencyPropertyChangedEventArgs e) => UpdateIcon();
 
-		#endregion
+		#endregion IconTemplate
 
 		#region IconTemplateSelector
 
@@ -66,7 +68,7 @@ public DataTemplate IconTemplate
 				new FrameworkPropertyMetadata(null, OnIconTemplateSelectorChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="IconTemplateSelector"/> property. This dependency property 
+		/// Gets or sets the <see cref="IconTemplateSelector"/> property. This dependency property
 		/// indicates the DataTemplateSelector for the Icon.
 		/// </summary>
 		public DataTemplateSelector IconTemplateSelector
@@ -81,15 +83,15 @@ public DataTemplateSelector IconTemplateSelector
 		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="IconTemplateSelector"/> property.</summary>
 		protected virtual void OnIconTemplateSelectorChanged(DependencyPropertyChangedEventArgs e) => UpdateIcon();
 
-		#endregion
+		#endregion IconTemplateSelector
 
-		#endregion
+		#endregion Properties
 
 		#region Private Mehods
 
 		private static void OnIconPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
 		{
-			if (e.NewValue != null) ((MenuItemEx) sender).UpdateIcon();
+			if (e.NewValue != null) ((MenuItemEx)sender).UpdateIcon();
 		}
 
 		private void UpdateIcon()
@@ -106,6 +108,6 @@ private void UpdateIcon()
 			_reentrantFlag = false;
 		}
 
-		#endregion
+		#endregion Private Mehods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/NamespaceDoc.cs b/source/Components/AvalonDock/Controls/NamespaceDoc.cs
index ab113337..c14d0973 100644
--- a/source/Components/AvalonDock/Controls/NamespaceDoc.cs
+++ b/source/Components/AvalonDock/Controls/NamespaceDoc.cs
@@ -5,4 +5,4 @@ namespace AvalonDock.Controls
 	internal class NamespaceDoc
 	{
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/NavigatorWindow.cs b/source/Components/AvalonDock/Controls/NavigatorWindow.cs
index 8de7770f..8318cb29 100644
--- a/source/Components/AvalonDock/Controls/NavigatorWindow.cs
+++ b/source/Components/AvalonDock/Controls/NavigatorWindow.cs
@@ -7,11 +7,11 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
+using AvalonDock.Themes;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
-using AvalonDock.Layout;
-using AvalonDock.Themes;
 using System.Windows.Controls;
 
 namespace AvalonDock.Controls
@@ -27,16 +27,17 @@ namespace AvalonDock.Controls
 	public class NavigatorWindow : Window
 	{
 		#region fields
+
 		private const string PART_AnchorableListBox = "PART_AnchorableListBox";
 		private const string PART_DocumentListBox = "PART_DocumentListBox";
 
-		private ResourceDictionary currentThemeResourceDictionary; // = null
 		private DockingManager _manager;
 		private bool _isSelectingDocument;
 		private ListBox _anchorableListBox;
 		private ListBox _documentListBox;
 		private bool _internalSetSelectedDocument = false;
 		private bool _internalSetSelectedAnchorable = false;
+
 		#endregion fields
 
 		#region Constructors
@@ -71,7 +72,7 @@ internal NavigatorWindow(DockingManager manager)
 			UpdateThemeResources();
 		}
 
-		#endregion
+		#endregion Constructors
 
 		#region Properties
 
@@ -84,12 +85,12 @@ internal NavigatorWindow(DockingManager manager)
 		public static readonly DependencyProperty DocumentsProperty = DocumentsPropertyKey.DependencyProperty;
 
 		/// <summary>
-		/// Gets the <see cref="Documents"/> property. This dependency property 
+		/// Gets the <see cref="Documents"/> property. This dependency property
 		/// indicates the list of documents.
 		/// </summary>
 		public LayoutDocumentItem[] Documents => (LayoutDocumentItem[])GetValue(DocumentsProperty);
 
-		#endregion
+		#endregion Documents
 
 		#region Anchorables
 
@@ -100,12 +101,12 @@ internal NavigatorWindow(DockingManager manager)
 		public static readonly DependencyProperty AnchorablesProperty = AnchorablesPropertyKey.DependencyProperty;
 
 		/// <summary>
-		/// Gets the <see cref="Anchorables"/> property. This dependency property 
+		/// Gets the <see cref="Anchorables"/> property. This dependency property
 		/// indicates the list of anchorables.
 		/// </summary>
 		public IEnumerable<LayoutAnchorableItem> Anchorables => (IEnumerable<LayoutAnchorableItem>)GetValue(AnchorablesProperty);
 
-		#endregion
+		#endregion Anchorables
 
 		#region SelectedDocument
 
@@ -114,7 +115,7 @@ internal NavigatorWindow(DockingManager manager)
 				new FrameworkPropertyMetadata(null, OnSelectedDocumentChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="SelectedDocument"/> property.  This dependency property 
+		/// Gets or sets the <see cref="SelectedDocument"/> property.  This dependency property
 		/// indicates the selected document.
 		/// </summary>
 		public LayoutDocumentItem SelectedDocument
@@ -129,12 +130,12 @@ public LayoutDocumentItem SelectedDocument
 		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="SelectedDocument"/> property.</summary>
 		protected virtual void OnSelectedDocumentChanged(DependencyPropertyChangedEventArgs e)
 		{
-			if (_internalSetSelectedDocument|| SelectedDocument == null || !SelectedDocument.ActivateCommand.CanExecute(null)) return;
+			if (_internalSetSelectedDocument || SelectedDocument == null || !SelectedDocument.ActivateCommand.CanExecute(null)) return;
 			Hide();
 			SelectedDocument.ActivateCommand.Execute(null);
 		}
 
-		#endregion
+		#endregion SelectedDocument
 
 		#region SelectedAnchorable
 
@@ -143,7 +144,7 @@ protected virtual void OnSelectedDocumentChanged(DependencyPropertyChangedEventA
 				new FrameworkPropertyMetadata(null, OnSelectedAnchorableChanged));
 
 		/// <summary>
-		/// Gets or sets the <see cref="SelectedAnchorable"/> property. This dependency property 
+		/// Gets or sets the <see cref="SelectedAnchorable"/> property. This dependency property
 		/// indicates the selected anchorable.
 		/// </summary>
 		public LayoutAnchorableItem SelectedAnchorable
@@ -168,11 +169,11 @@ protected virtual void OnSelectedAnchorableChanged(DependencyPropertyChangedEven
 			}
 		}
 
-		#endregion
+		#endregion SelectedAnchorable
 
-		#endregion
+		#endregion Properties
 
-		#region Overrides   
+		#region Overrides
 
 		/// <inheritdoc />
 		public override void OnApplyTemplate()
@@ -274,20 +275,19 @@ protected override void OnPreviewKeyUp(System.Windows.Input.KeyEventArgs e)
 			base.OnPreviewKeyUp(e);
 		}
 
-
-		#endregion
+		#endregion Overrides
 
 		#region Internal Methods
 
 		/// <summary>
-		/// Provides a secure method for setting the Anchorables property.  
+		/// Provides a secure method for setting the Anchorables property.
 		/// This dependency property indicates the list of anchorables.
 		/// </summary>
 		/// <param name="value">The new value for the property.</param>
 		protected void SetAnchorables(IEnumerable<LayoutAnchorableItem> value) => SetValue(AnchorablesPropertyKey, value);
 
 		/// <summary>
-		/// Provides a secure method for setting the Documents property.  
+		/// Provides a secure method for setting the Documents property.
 		/// This dependency property indicates the list of documents.
 		/// </summary>
 		/// <param name="value">The new value for the property.</param>
@@ -297,29 +297,13 @@ internal void UpdateThemeResources(Theme oldTheme = null)
 		{
 			if (oldTheme != null)
 			{
-				if (oldTheme is DictionaryTheme)
-				{
-					if (currentThemeResourceDictionary != null)
-					{
-						Resources.MergedDictionaries.Remove(currentThemeResourceDictionary);
-						currentThemeResourceDictionary = null;
-					}
-				}
-				else
-				{
-					var resourceDictionaryToRemove = Resources.MergedDictionaries.FirstOrDefault(r => r.Source == oldTheme.GetResourceUri());
-					if (resourceDictionaryToRemove != null) Resources.MergedDictionaries.Remove(resourceDictionaryToRemove);
-				}
+				var resourceDictionaryToRemove = Resources.MergedDictionaries.FirstOrDefault(r => r.Source == oldTheme.GetResourceUri());
+				if (resourceDictionaryToRemove != null) Resources.MergedDictionaries.Remove(resourceDictionaryToRemove);
 			}
 
 			if (_manager.Theme == null) return;
-			if (_manager.Theme is DictionaryTheme dictionaryTheme)
-			{
-				currentThemeResourceDictionary = dictionaryTheme.ThemeResourceDictionary;
-				Resources.MergedDictionaries.Add(currentThemeResourceDictionary);
-			}
-			else
-				Resources.MergedDictionaries.Add(new ResourceDictionary() {Source = _manager.Theme.GetResourceUri()});
+
+			Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = _manager.Theme.GetResourceUri() });
 		}
 
 		internal void SelectNextDocument()
@@ -341,7 +325,7 @@ internal void SelectNextAnchorable()
 			InternalSetSelectedAnchorable(anchorablesArray[anchorableIndex]);
 		}
 
-		#endregion
+		#endregion Internal Methods
 
 		#region Private Methods
 
@@ -371,6 +355,6 @@ private void OnLoaded(object sender, RoutedEventArgs e)
 
 		private void OnUnloaded(object sender, RoutedEventArgs e) => Unloaded -= OnUnloaded;
 
-		#endregion
+		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/OverlayWindow.cs b/source/Components/AvalonDock/Controls/OverlayWindow.cs
index c8c6c2fb..bb86673d 100644
--- a/source/Components/AvalonDock/Controls/OverlayWindow.cs
+++ b/source/Components/AvalonDock/Controls/OverlayWindow.cs
@@ -7,13 +7,13 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
+using AvalonDock.Themes;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Shapes;
-using AvalonDock.Layout;
-using AvalonDock.Themes;
 
 namespace AvalonDock.Controls
 {
@@ -24,7 +24,7 @@ namespace AvalonDock.Controls
 	public class OverlayWindow : Window, IOverlayWindow
 	{
 		#region fields
-		private ResourceDictionary currentThemeResourceDictionary; // = null
+
 		private Canvas _mainCanvasPanel;
 		private Grid _gridDockingManagerDropTargets;    // Showing and activating 4 outer drop taget buttons over DockingManager
 		private Grid _gridAnchorablePaneDropTargets;    // Showing and activating 5 inner drop target buttons over layout anchorable pane
@@ -32,29 +32,36 @@ public class OverlayWindow : Window, IOverlayWindow
 		private Grid _gridDocumentPaneFullDropTargets;  // Showing and activating 9 inner drop target buttons over document pane
 
 		#region DockingManagerDropTargets
+
 		private FrameworkElement _dockingManagerDropTargetBottom; // 4 outer drop taget buttons over DockingManager
 		private FrameworkElement _dockingManagerDropTargetTop;
 		private FrameworkElement _dockingManagerDropTargetLeft;
 		private FrameworkElement _dockingManagerDropTargetRight;
+
 		#endregion DockingManagerDropTargets
 
 		#region AnchorablePaneDropTargets
+
 		private FrameworkElement _anchorablePaneDropTargetBottom; // 5 inner drop target buttons over layout anchorable pane
 		private FrameworkElement _anchorablePaneDropTargetTop;
 		private FrameworkElement _anchorablePaneDropTargetLeft;
 		private FrameworkElement _anchorablePaneDropTargetRight;
 		private FrameworkElement _anchorablePaneDropTargetInto;
+
 		#endregion AnchorablePaneDropTargets
 
 		#region DocumentPaneDropTargets
+
 		private FrameworkElement _documentPaneDropTargetBottom;   // 5 inner drop target buttons over document pane
 		private FrameworkElement _documentPaneDropTargetTop;
 		private FrameworkElement _documentPaneDropTargetLeft;
 		private FrameworkElement _documentPaneDropTargetRight;
 		private FrameworkElement _documentPaneDropTargetInto;
+
 		#endregion DocumentPaneDropTargets
 
 		#region DocumentPaneFullDropTargets
+
 		private FrameworkElement _documentPaneDropTargetBottomAsAnchorablePane; // 9 inner drop target buttons over document pane
 		private FrameworkElement _documentPaneDropTargetTopAsAnchorablePane;
 		private FrameworkElement _documentPaneDropTargetLeftAsAnchorablePane;
@@ -65,12 +72,14 @@ public class OverlayWindow : Window, IOverlayWindow
 		private FrameworkElement _documentPaneFullDropTargetLeft;
 		private FrameworkElement _documentPaneFullDropTargetRight;
 		private FrameworkElement _documentPaneFullDropTargetInto;
+
 		#endregion DocumentPaneFullDropTargets
 
 		private Path _previewBox;
 		private readonly IOverlayWindowHost _host;
 		private LayoutFloatingWindowControl _floatingWindow = null;
 		private readonly List<IDropArea> _visibleAreas = new List<IDropArea>();
+
 		#endregion fields
 
 		#region Constructors
@@ -92,7 +101,7 @@ internal OverlayWindow(IOverlayWindowHost host)
 			UpdateThemeResources();
 		}
 
-		#endregion
+		#endregion Constructors
 
 		#region Properties.
 
@@ -101,7 +110,7 @@ internal OverlayWindow(IOverlayWindowHost host)
 		/// </summary>
 		public bool IsHostedInFloatingWindow => _host is LayoutDocumentFloatingWindowControl || _host is LayoutAnchorableFloatingWindowControl;
 
-		#endregion
+		#endregion Properties.
 
 		#region Overrides
 
@@ -157,7 +166,7 @@ protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
 			base.OnClosing(e);
 		}
 
-		#endregion
+		#endregion Overrides
 
 		#region Internal Methods
 
@@ -165,35 +174,16 @@ internal void UpdateThemeResources(Theme oldTheme = null)
 		{
 			if (oldTheme != null)
 			{
-				if (oldTheme is DictionaryTheme)
-				{
-					if (currentThemeResourceDictionary != null)
-					{
-						Resources.MergedDictionaries.Remove(currentThemeResourceDictionary);
-						currentThemeResourceDictionary = null;
-					}
-				}
-				else
-				{
-					var resourceDictionaryToRemove =
-						Resources.MergedDictionaries.FirstOrDefault(r => r.Source == oldTheme.GetResourceUri());
-					if (resourceDictionaryToRemove != null)
-						Resources.MergedDictionaries.Remove(
-							resourceDictionaryToRemove);
-				}
+				var resourceDictionaryToRemove =
+					Resources.MergedDictionaries.FirstOrDefault(r => r.Source == oldTheme.GetResourceUri());
+				if (resourceDictionaryToRemove != null)
+					Resources.MergedDictionaries.Remove(
+						resourceDictionaryToRemove);
 			}
 
 			if (_host.Manager.Theme != null)
 			{
-				if (_host.Manager.Theme is DictionaryTheme theme)
-				{
-					currentThemeResourceDictionary = theme.ThemeResourceDictionary;
-					Resources.MergedDictionaries.Add(currentThemeResourceDictionary);
-				}
-				else
-				{
-					Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = _host.Manager.Theme.GetResourceUri() });
-				}
+				Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = _host.Manager.Theme.GetResourceUri() });
 			}
 		}
 
@@ -207,10 +197,9 @@ internal void HideDropTargets()
 		{
 			if (_mainCanvasPanel != null)
 				_mainCanvasPanel.Visibility = System.Windows.Visibility.Hidden;
-
 		}
 
-		#endregion
+		#endregion Internal Methods
 
 		#region Private Methods
 
@@ -275,70 +264,71 @@ private List<LayoutContent> GetAllLayoutContents(object source)
 		{
 			var result = new List<LayoutContent>();
 
-            if (source is LayoutDocumentFloatingWindow documentFloatingWindow)
-            {
-                foreach (var layoutElement in documentFloatingWindow.Children)
-                {
-                    result.AddRange(GetAllLayoutContents(layoutElement));
-                }
-            }
-
-            if (source is LayoutAnchorableFloatingWindow anchorableFloatingWindow)
-            {
-                foreach (var layoutElement in anchorableFloatingWindow.Children)
-                {
-                    result.AddRange(GetAllLayoutContents(layoutElement));
-                }
-            }
-
-            if (source is LayoutDocumentPaneGroup documentPaneGroup)
-            {
-                foreach (var layoutDocumentPane in documentPaneGroup.Children)
-                {
-                    result.AddRange(GetAllLayoutContents(layoutDocumentPane));
-                }
-            }
-
-            if (source is LayoutAnchorablePaneGroup anchorablePaneGroup)
-            {
-                foreach (var layoutDocumentPane in anchorablePaneGroup.Children)
-                {
-                    result.AddRange(GetAllLayoutContents(layoutDocumentPane));
-                }
-            }
-
-            if (source is LayoutDocumentPane documentPane)
-            {
-                foreach (var layoutContent in documentPane.Children)
-                {
-                    result.Add(layoutContent);
-                }
-            }
-
-            if (source is LayoutAnchorablePane anchorablePane)
-            {
-                foreach (var layoutContent in anchorablePane.Children)
-                {
-                    result.Add(layoutContent);
-                }
-            }
-
-            if (source is LayoutDocument document)
-            {
-                result.Add(document);
-            }
-
-            if (source is LayoutAnchorable anchorable)
-            {
-                result.Add(anchorable);
-            }
-
-            return result;
+			if (source is LayoutDocumentFloatingWindow documentFloatingWindow)
+			{
+				foreach (var layoutElement in documentFloatingWindow.Children)
+				{
+					result.AddRange(GetAllLayoutContents(layoutElement));
+				}
+			}
+
+			if (source is LayoutAnchorableFloatingWindow anchorableFloatingWindow)
+			{
+				foreach (var layoutElement in anchorableFloatingWindow.Children)
+				{
+					result.AddRange(GetAllLayoutContents(layoutElement));
+				}
+			}
+
+			if (source is LayoutDocumentPaneGroup documentPaneGroup)
+			{
+				foreach (var layoutDocumentPane in documentPaneGroup.Children)
+				{
+					result.AddRange(GetAllLayoutContents(layoutDocumentPane));
+				}
+			}
+
+			if (source is LayoutAnchorablePaneGroup anchorablePaneGroup)
+			{
+				foreach (var layoutDocumentPane in anchorablePaneGroup.Children)
+				{
+					result.AddRange(GetAllLayoutContents(layoutDocumentPane));
+				}
+			}
+
+			if (source is LayoutDocumentPane documentPane)
+			{
+				foreach (var layoutContent in documentPane.Children)
+				{
+					result.Add(layoutContent);
+				}
+			}
+
+			if (source is LayoutAnchorablePane anchorablePane)
+			{
+				foreach (var layoutContent in anchorablePane.Children)
+				{
+					result.Add(layoutContent);
+				}
+			}
+
+			if (source is LayoutDocument document)
+			{
+				result.Add(document);
+			}
+
+			if (source is LayoutAnchorable anchorable)
+			{
+				result.Add(anchorable);
+			}
+
+			return result;
 		}
 
-		#endregion
+		#endregion Private Methods
 
 		#region IOverlayWindow
+
 		/// <inheritdoc cref="IOverlayWindow"/>
 		IEnumerable<IDropTarget> IOverlayWindow.GetTargets()
 		{
@@ -356,6 +346,7 @@ IEnumerable<IDropTarget> IOverlayWindow.GetTargets()
 							yield return new DockingManagerDropTarget(dropAreaDockingManager.AreaElement, _dockingManagerDropTargetRight.GetScreenArea(), DropTargetType.DockingManagerDockRight);
 						}
 						break;
+
 					case DropAreaType.AnchorablePane:
 						{
 							// Dragging over AnchorablePane -> Add DropTarget Area
@@ -391,6 +382,7 @@ IEnumerable<IDropTarget> IOverlayWindow.GetTargets()
 								yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, dropAreaTitle.GetScreenArea(), DropTargetType.AnchorablePaneDockInside);
 						}
 						break;
+
 					case DropAreaType.DocumentPane:
 						{
 							// Dragging over DocumentPane -> Add DropTarget Area
@@ -476,6 +468,7 @@ IEnumerable<IDropTarget> IOverlayWindow.GetTargets()
 							}
 						}
 						break;
+
 					case DropAreaType.DocumentPaneGroup:
 						{
 							// Dragging over DocumentPaneGroup -> Add DropTarget Area
@@ -485,7 +478,6 @@ IEnumerable<IDropTarget> IOverlayWindow.GetTargets()
 						}
 						break;
 				}
-
 			}
 			yield break;
 		}
@@ -523,6 +515,7 @@ void IOverlayWindow.DragEnter(IDropArea area)
 					}
 					areaElement = _gridDockingManagerDropTargets;
 					break;
+
 				case DropAreaType.AnchorablePane:
 					areaElement = _gridAnchorablePaneDropTargets;
 
@@ -535,6 +528,7 @@ void IOverlayWindow.DragEnter(IDropArea area)
 					}
 					SetDropTargetIntoVisibility(layoutAnchorablePane);
 					break;
+
 				case DropAreaType.DocumentPaneGroup:
 					{
 						areaElement = _gridDocumentPaneDropTargets;
@@ -552,6 +546,7 @@ void IOverlayWindow.DragEnter(IDropArea area)
 						_documentPaneDropTargetBottom.Visibility = Visibility.Hidden;
 					}
 					break;
+
 				case DropAreaType.DocumentPane:
 				default:
 					{
@@ -615,7 +610,6 @@ void IOverlayWindow.DragEnter(IDropArea area)
 								_documentPaneDropTargetRightAsAnchorablePane.Visibility = System.Windows.Visibility.Collapsed;
 								_documentPaneDropTargetTopAsAnchorablePane.Visibility = System.Windows.Visibility.Collapsed;
 							}
-
 							else if (parentDocumentPaneGroup != null &&
 								parentDocumentPaneGroup.Children.Where(c => c.IsVisible).Count() > 1)
 							{
@@ -640,7 +634,6 @@ void IOverlayWindow.DragEnter(IDropArea area)
 											(isFirstChild ? System.Windows.Visibility.Visible : System.Windows.Visibility.Hidden) :
 											System.Windows.Visibility.Hidden;
 
-
 									_documentPaneDropTargetRightAsAnchorablePane.Visibility =
 										parentDocumentPaneGroup.Orientation == Orientation.Horizontal ?
 											(isLastChild ? System.Windows.Visibility.Visible : System.Windows.Visibility.Hidden) :
@@ -695,7 +688,6 @@ void IOverlayWindow.DragEnter(IDropArea area)
 									_documentPaneDropTargetTop.Visibility = Visibility.Visible;
 									_documentPaneDropTargetBottom.Visibility = Visibility.Visible;
 								}
-
 							}
 							else if (parentDocumentPaneGroup == null &&
 								layoutDocumentPane != null &&
@@ -736,12 +728,15 @@ void IOverlayWindow.DragLeave(IDropArea area)
 				case DropAreaType.DockingManager:
 					areaElement = _gridDockingManagerDropTargets;
 					break;
+
 				case DropAreaType.AnchorablePane:
 					areaElement = _gridAnchorablePaneDropTargets;
 					break;
+
 				case DropAreaType.DocumentPaneGroup:
 					areaElement = _gridDocumentPaneDropTargets;
 					break;
+
 				case DropAreaType.DocumentPane:
 				default:
 					{
@@ -780,6 +775,6 @@ void IOverlayWindow.DragDrop(IDropTarget target)
 			target.Drop(_floatingWindow.Model as LayoutFloatingWindow);
 		}
 
-		#endregion
+		#endregion IOverlayWindow
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/ReentrantFlag.cs b/source/Components/AvalonDock/Controls/ReentrantFlag.cs
index 98a0887f..40047924 100644
--- a/source/Components/AvalonDock/Controls/ReentrantFlag.cs
+++ b/source/Components/AvalonDock/Controls/ReentrantFlag.cs
@@ -14,7 +14,9 @@ namespace AvalonDock.Controls
 	internal class ReentrantFlag
 	{
 		#region fields
+
 		private bool _flag = false;
+
 		#endregion fields
 
 		#region Properties
@@ -27,7 +29,7 @@ public bool CanEnter
 			}
 		}
 
-		#endregion
+		#endregion Properties
 
 		#region Public Methods
 
@@ -38,13 +40,14 @@ public _ReentrantFlagHandler Enter()
 			return new _ReentrantFlagHandler(this);
 		}
 
-		#endregion
+		#endregion Public Methods
 
 		#region Internal Classes
 
 		public class _ReentrantFlagHandler : IDisposable
 		{
 			private ReentrantFlag _owner;
+
 			public _ReentrantFlagHandler(ReentrantFlag owner)
 			{
 				_owner = owner;
@@ -57,6 +60,6 @@ public void Dispose()
 			}
 		}
 
-		#endregion
+		#endregion Internal Classes
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/NamespaceDoc.cs b/source/Components/AvalonDock/Controls/Shell/NamespaceDoc.cs
index 0d474c45..2d301945 100644
--- a/source/Components/AvalonDock/Controls/Shell/NamespaceDoc.cs
+++ b/source/Components/AvalonDock/Controls/Shell/NamespaceDoc.cs
@@ -5,4 +5,4 @@ namespace AvalonDock.Controls.Shell
 	internal class NamespaceDoc
 	{
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/Standard/ComGuids.cs b/source/Components/AvalonDock/Controls/Shell/Standard/ComGuids.cs
index 416bcf43..7d15ee74 100644
--- a/source/Components/AvalonDock/Controls/Shell/Standard/ComGuids.cs
+++ b/source/Components/AvalonDock/Controls/Shell/Standard/ComGuids.cs
@@ -17,36 +17,52 @@ internal static partial class IID
 	{
 		/// <summary>IID_IEnumIDList</summary>
 		public const string EnumIdList = "000214F2-0000-0000-C000-000000000046";
+
 		/// <summary>IID_IEnumObjects</summary>
 		public const string EnumObjects = "2c1c7e2e-2d0e-4059-831e-1e6f82335c2e";
+
 		/// <summary>IID_IHTMLDocument2</summary>
 		public const string HtmlDocument2 = "332C4425-26CB-11D0-B483-00C04FD90119";
+
 		/// <summary>IID_IModalWindow</summary>
 		public const string ModalWindow = "b4db1657-70d7-485e-8e3e-6fcb5a5c1802";
+
 		/// <summary>IID_IObjectArray</summary>
 		public const string ObjectArray = "92CA9DCD-5622-4bba-A805-5E9F541BD8C9";
+
 		/// <summary>IID_IObjectCollection</summary>
 		public const string ObjectCollection = "5632b1a4-e38a-400a-928a-d4cd63230295";
+
 		/// <summary>IID_IPropertyNotifySink</summary>
 		public const string PropertyNotifySink = "9BFBBC02-EFF1-101A-84ED-00AA00341D07";
+
 		/// <summary>IID_IPropertyStore</summary>
 		public const string PropertyStore = "886d8eeb-8cf2-4446-8d02-cdba1dbdcf99";
+
 		/// <summary>IID_IServiceProvider</summary>
 		public const string ServiceProvider = "6d5140c1-7436-11ce-8034-00aa006009fa";
+
 		/// <summary>IID_IShellFolder</summary>
 		public const string ShellFolder = "000214E6-0000-0000-C000-000000000046";
+
 		/// <summary>IID_IShellLink</summary>
 		public const string ShellLink = "000214F9-0000-0000-C000-000000000046";
+
 		/// <summary>IID_IShellItem</summary>
 		public const string ShellItem = "43826d1e-e718-42ee-bc55-a1e261c37bfe";
+
 		/// <summary>IID_IShellItem2</summary>
 		public const string ShellItem2 = "7e9fb0d3-919f-4307-ab2e-9b1860310c93";
+
 		/// <summary>IID_IShellItemArray</summary>
 		public const string ShellItemArray = "B63EA76D-1F85-456F-A19C-48159EFA858B";
+
 		/// <summary>IID_ITaskbarList</summary>
 		public const string TaskbarList = "56FDF342-FD6D-11d0-958A-006097C9A090";
+
 		/// <summary>IID_ITaskbarList2</summary>
 		public const string TaskbarList2 = "602D4995-B13A-429b-A66E-1935E44F4317";
+
 		/// <summary>IID_IUnknown</summary>
 		public const string Unknown = "00000000-0000-0000-C000-000000000046";
 
@@ -54,20 +70,26 @@ internal static partial class IID
 
 		/// <summary>IID_IApplicationDestinations</summary>
 		public const string ApplicationDestinations = "12337d35-94c6-48a0-bce7-6a9c69d4d600";
+
 		/// <summary>IID_IApplicationDocumentLists</summary>
 		public const string ApplicationDocumentLists = "3c594f9f-9f30-47a1-979a-c9e83d3d0a06";
+
 		/// <summary>IID_ICustomDestinationList</summary>
 		public const string CustomDestinationList = "6332debf-87b5-4670-90c0-5e57b408a49e";
+
 		/// <summary>IID_IObjectWithAppUserModelID</summary>
 		public const string ObjectWithAppUserModelId = "36db0196-9665-46d1-9ba7-d3709eecf9ed";
+
 		/// <summary>IID_IObjectWithProgID</summary>
 		public const string ObjectWithProgId = "71e806fb-8dee-46fc-bf8c-7748a8a1ae13";
+
 		/// <summary>IID_ITaskbarList3</summary>
 		public const string TaskbarList3 = "ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf";
+
 		/// <summary>IID_ITaskbarList4</summary>
 		public const string TaskbarList4 = "c43dc798-95d1-4bea-9030-bb99e2983a1a";
 
-		#endregion
+		#endregion Win7 IIDs
 	}
 
 	internal static partial class CLSID
@@ -77,9 +99,11 @@ internal static partial class CLSID
 		/// <summary>CLSID_TaskbarList</summary>
 		/// <remarks>IID_ITaskbarList</remarks>
 		public const string TaskbarList = "56FDF344-FD6D-11d0-958A-006097C9A090";
+
 		/// <summary>CLSID_EnumerableObjectCollection</summary>
 		/// <remarks>IID_IEnumObjects.</remarks>
 		public const string EnumerableObjectCollection = "2d3468c1-36a7-43b6-ac24-d3f02fd9607a";
+
 		/// <summary>CLSID_ShellLink</summary>
 		/// <remarks>IID_IShellLink</remarks>
 		public const string ShellLink = "00021401-0000-0000-C000-000000000046";
@@ -89,13 +113,15 @@ internal static partial class CLSID
 		/// <summary>CLSID_DestinationList</summary>
 		/// <remarks>IID_ICustomDestinationList</remarks>
 		public const string DestinationList = "77f10cf0-3db5-4966-b520-b7c54fd35ed6";
+
 		/// <summary>CLSID_ApplicationDestinations</summary>
 		/// <remarks>IID_IApplicationDestinations</remarks>
 		public const string ApplicationDestinations = "86c14003-4d6b-4ef3-a7b4-0506663b2e68";
+
 		/// <summary>CLSID_ApplicationDocumentLists</summary>
 		/// <remarks>IID_IApplicationDocumentLists</remarks>
 		public const string ApplicationDocumentLists = "86bec222-30f2-47e0-9f25-60d11cd75c28";
 
-		#endregion
+		#endregion Win7 CLSIDs
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/Standard/Debug.cs b/source/Components/AvalonDock/Controls/Shell/Standard/Debug.cs
index 1876474b..dfd96f4d 100644
--- a/source/Components/AvalonDock/Controls/Shell/Standard/Debug.cs
+++ b/source/Components/AvalonDock/Controls/Shell/Standard/Debug.cs
@@ -306,4 +306,4 @@ public static void IsNotOnMainThread()
 			if (System.Windows.Application.Current.Dispatcher.CheckAccess()) _Break();
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/Standard/DoubleUtil.cs b/source/Components/AvalonDock/Controls/Shell/Standard/DoubleUtil.cs
index 18e04290..ad116490 100644
--- a/source/Components/AvalonDock/Controls/Shell/Standard/DoubleUtil.cs
+++ b/source/Components/AvalonDock/Controls/Shell/Standard/DoubleUtil.cs
@@ -9,13 +9,12 @@ This program is provided to you under the terms of the Microsoft Public
 
 namespace Standard
 {
-	using System;
 	using System.Diagnostics.CodeAnalysis;
 
 	/// <summary>
 	/// DoubleUtil uses fixed eps to provide fuzzy comparison functionality for doubles.
-	/// Note that FP noise is a big problem and using any of these compare 
-	/// methods is not a complete solution, but rather the way to reduce 
+	/// Note that FP noise is a big problem and using any of these compare
+	/// methods is not a complete solution, but rather the way to reduce
 	/// the probability of repeating unnecessary work.
 	/// </summary>
 	internal static class DoubleUtilities
@@ -26,11 +25,11 @@ internal static class DoubleUtilities
 		private const double Epsilon = 0.00000153;
 
 		/// <summary>
-		/// AreClose returns whether or not two doubles are "close".  That is, whether or 
+		/// AreClose returns whether or not two doubles are "close".  That is, whether or
 		/// not they are within epsilon of each other.
 		/// There are plenty of ways for this to return false even for numbers which
-		/// are theoretically identical, so no code calling this should fail to work if this 
-		/// returns false. 
+		/// are theoretically identical, so no code calling this should fail to work if this
+		/// returns false.
 		/// </summary>
 		/// <param name="value1">The first double to compare.</param>
 		/// <param name="value2">The second double to compare.</param>
@@ -52,7 +51,7 @@ public static bool AreClose(double value1, double value2)
 		/// That is, whether or not the first is strictly less than *and* not within epsilon of
 		/// the other number.
 		/// There are plenty of ways for this to return false even for numbers which
-		/// are theoretically identical, so no code calling this should fail to work if this 
+		/// are theoretically identical, so no code calling this should fail to work if this
 		/// returns false.
 		/// </summary>
 		/// <param name="value1">The first double to compare.</param>
@@ -69,7 +68,7 @@ public static bool LessThan(double value1, double value2)
 		/// That is, whether or not the first is strictly greater than *and* not within epsilon of
 		/// the other number.
 		/// There are plenty of ways for this to return false even for numbers which
-		/// are theoretically identical, so no code calling this should fail to work if this 
+		/// are theoretically identical, so no code calling this should fail to work if this
 		/// returns false.
 		/// </summary>
 		/// <param name="value1">The first double to compare.</param>
@@ -86,7 +85,7 @@ public static bool GreaterThan(double value1, double value2)
 		/// the second double.  That is, whether or not the first is strictly less than or within
 		/// epsilon of the other number.
 		/// There are plenty of ways for this to return false even for numbers which
-		/// are theoretically identical, so no code calling this should fail to work if this 
+		/// are theoretically identical, so no code calling this should fail to work if this
 		/// returns false.
 		/// </summary>
 		/// <param name="value1">The first double to compare.</param>
@@ -103,7 +102,7 @@ public static bool LessThanOrClose(double value1, double value2)
 		/// the second double.  That is, whether or not the first is strictly greater than or within
 		/// epsilon of the other number.
 		/// There are plenty of ways for this to return false even for numbers which
-		/// are theoretically identical, so no code calling this should fail to work if this 
+		/// are theoretically identical, so no code calling this should fail to work if this
 		/// returns false.
 		/// </summary>
 		/// <param name="value1">The first double to compare.</param>
@@ -137,4 +136,4 @@ public static bool IsValidSize(double value)
 			return IsFinite(value) && GreaterThanOrClose(value, 0);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/Standard/DpiHelper.cs b/source/Components/AvalonDock/Controls/Shell/Standard/DpiHelper.cs
index c5866741..62ab5c11 100644
--- a/source/Components/AvalonDock/Controls/Shell/Standard/DpiHelper.cs
+++ b/source/Components/AvalonDock/Controls/Shell/Standard/DpiHelper.cs
@@ -80,4 +80,4 @@ public static Size DeviceSizeToLogical(Size deviceSize)
 			return new Size(pt.X, pt.Y);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/Standard/ErrorCodes.cs b/source/Components/AvalonDock/Controls/Shell/Standard/ErrorCodes.cs
index 0afcdba1..6c948375 100644
--- a/source/Components/AvalonDock/Controls/Shell/Standard/ErrorCodes.cs
+++ b/source/Components/AvalonDock/Controls/Shell/Standard/ErrorCodes.cs
@@ -35,60 +35,79 @@ internal struct Win32Error
 		/// <summary>The operation completed successfully.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_SUCCESS = new Win32Error(0);
+
 		/// <summary>Incorrect function.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_INVALID_FUNCTION = new Win32Error(1);
+
 		/// <summary>The system cannot find the file specified.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_FILE_NOT_FOUND = new Win32Error(2);
+
 		/// <summary>The system cannot find the path specified.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_PATH_NOT_FOUND = new Win32Error(3);
+
 		/// <summary>The system cannot open the file.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_TOO_MANY_OPEN_FILES = new Win32Error(4);
+
 		/// <summary>Access is denied.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_ACCESS_DENIED = new Win32Error(5);
+
 		/// <summary>The handle is invalid.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_INVALID_HANDLE = new Win32Error(6);
+
 		/// <summary>Not enough storage is available to complete this operation.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_OUTOFMEMORY = new Win32Error(14);
+
 		/// <summary>There are no more files.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_NO_MORE_FILES = new Win32Error(18);
+
 		/// <summary>The process cannot access the file because it is being used by another process.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_SHARING_VIOLATION = new Win32Error(32);
+
 		/// <summary>The parameter is incorrect.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_INVALID_PARAMETER = new Win32Error(87);
+
 		/// <summary>The data area passed to a system call is too small.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_INSUFFICIENT_BUFFER = new Win32Error(122);
+
 		/// <summary>Cannot nest calls to LoadModule.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_NESTING_NOT_ALLOWED = new Win32Error(215);
+
 		/// <summary>Illegal operation attempted on a registry key that has been marked for deletion.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_KEY_DELETED = new Win32Error(1018);
+
 		/// <summary>Element not found.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_NOT_FOUND = new Win32Error(1168);
+
 		/// <summary>There was no match for the specified key in the index.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_NO_MATCH = new Win32Error(1169);
+
 		/// <summary>An invalid device was specified.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_BAD_DEVICE = new Win32Error(1200);
+
 		/// <summary>The operation was canceled by the user.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_CANCELLED = new Win32Error(1223);
+
 		/// <summary>The window class was already registered.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_CLASS_ALREADY_EXISTS = new Win32Error(1410);
+
 		/// <summary>The specified datatype is invalid.</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly Win32Error ERROR_INVALID_DATATYPE = new Win32Error(1804);
@@ -104,7 +123,7 @@ internal struct Win32Error
 		/// <returns>The equivilent HRESULT value.</returns>
 		public static explicit operator HRESULT(Win32Error error)
 		{
-			// #define __HRESULT_FROM_WIN32(x) 
+			// #define __HRESULT_FROM_WIN32(x)
 			//     ((HRESULT)(x) <= 0 ? ((HRESULT)(x)) : ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)))
 			return error._value <= 0 ? new HRESULT((uint)error._value) : HRESULT.Make(true, Facility.Win32, error._value & 0x0000FFFF);
 		}
@@ -158,22 +177,31 @@ internal enum Facility
 	{
 		/// <summary>FACILITY_NULL</summary>
 		Null = 0,
+
 		/// <summary>FACILITY_RPC</summary>
 		Rpc = 1,
+
 		/// <summary>FACILITY_DISPATCH</summary>
 		Dispatch = 2,
+
 		/// <summary>FACILITY_STORAGE</summary>
 		Storage = 3,
+
 		/// <summary>FACILITY_ITF</summary>
 		Itf = 4,
+
 		/// <summary>FACILITY_WIN32</summary>
 		Win32 = 7,
+
 		/// <summary>FACILITY_WINDOWS</summary>
 		Windows = 8,
+
 		/// <summary>FACILITY_CONTROL</summary>
 		Control = 10,
+
 		/// <summary>MSDN doced facility code for ESE errors.</summary>
 		Ese = 0xE5E,
+
 		/// <summary>FACILITY_WINCODEC (WIC)</summary>
 		WinCodec = 0x898,
 	}
@@ -190,33 +218,43 @@ internal struct HRESULT
 		/// <summary>S_OK</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT S_OK = new HRESULT(0x00000000);
+
 		/// <summary>S_FALSE</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT S_FALSE = new HRESULT(0x00000001);
+
 		/// <summary>E_PENDING</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT E_PENDING = new HRESULT(0x8000000A);
+
 		/// <summary>E_NOTIMPL</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT E_NOTIMPL = new HRESULT(0x80004001);
+
 		/// <summary>E_NOINTERFACE</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT E_NOINTERFACE = new HRESULT(0x80004002);
+
 		/// <summary>E_POINTER</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT E_POINTER = new HRESULT(0x80004003);
+
 		/// <summary>E_ABORT</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT E_ABORT = new HRESULT(0x80004004);
+
 		/// <summary>E_FAIL</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT E_FAIL = new HRESULT(0x80004005);
+
 		/// <summary>E_UNEXPECTED</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT E_UNEXPECTED = new HRESULT(0x8000FFFF);
+
 		/// <summary>STG_E_INVALIDFUNCTION</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT STG_E_INVALIDFUNCTION = new HRESULT(0x80030001);
+
 		/// <summary>REGDB_E_CLASSNOTREG</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT REGDB_E_CLASSNOTREG = new HRESULT(0x80040154);
@@ -225,10 +263,12 @@ internal struct HRESULT
 		/// <remarks>There is no Assoc Handler for the given item registered by the specified application.</remarks>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT DESTS_E_NO_MATCHING_ASSOC_HANDLER = new HRESULT(0x80040F03);
+
 		/// <summary>DESTS_E_NORECDOCS.  Win7 internal error code for Jump Lists.</summary>
 		/// <remarks>The given item is excluded from the recent docs folder by the NoRecDocs bit on its registration.</remarks>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT DESTS_E_NORECDOCS = new HRESULT(0x80040F04);
+
 		/// <summary>DESTS_E_NOTALLCLEARED.  Win7 internal error code for Jump Lists.</summary>
 		/// <remarks>Not all of the items were successfully cleared</remarks>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
@@ -238,23 +278,29 @@ internal struct HRESULT
 		/// <remarks>Win32Error ERROR_ACCESS_DENIED.</remarks>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT E_ACCESSDENIED = new HRESULT(0x80070005);
+
 		/// <summary>E_OUTOFMEMORY</summary>
 		/// <remarks>Win32Error ERROR_OUTOFMEMORY.</remarks>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT E_OUTOFMEMORY = new HRESULT(0x8007000E);
+
 		/// <summary>E_INVALIDARG</summary>
 		/// <remarks>Win32Error ERROR_INVALID_PARAMETER.</remarks>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT E_INVALIDARG = new HRESULT(0x80070057);
+
 		/// <summary>INTSAFE_E_ARITHMETIC_OVERFLOW</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT INTSAFE_E_ARITHMETIC_OVERFLOW = new HRESULT(0x80070216);
+
 		/// <summary>COR_E_OBJECTDISPOSED</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT COR_E_OBJECTDISPOSED = new HRESULT(0x80131622);
+
 		/// <summary>WC_E_GREATERTHAN</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT WC_E_GREATERTHAN = new HRESULT(0xC00CEE23);
+
 		/// <summary>WC_E_SYNTAX</summary>
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		public static readonly HRESULT WC_E_SYNTAX = new HRESULT(0xC00CEE2D);
@@ -321,7 +367,7 @@ public override string ToString()
 			// To properly add an HRESULT's name to the ToString table, just add the HRESULT
 			// like all the others above.
 			//
-			// CONSIDER: This data is static.  It could be cached 
+			// CONSIDER: This data is static.  It could be cached
 			// after first usage for fast lookup since the keys are unique.
 			//
 			foreach (var publicStaticField in typeof(HRESULT).GetFields(BindingFlags.Static | BindingFlags.Public))
@@ -443,4 +489,4 @@ public static void ThrowLastError()
 			Assert.Fail();
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/Standard/MessageWindow.cs b/source/Components/AvalonDock/Controls/Shell/Standard/MessageWindow.cs
index 19f71cd1..c5c234a7 100644
--- a/source/Components/AvalonDock/Controls/Shell/Standard/MessageWindow.cs
+++ b/source/Components/AvalonDock/Controls/Shell/Standard/MessageWindow.cs
@@ -14,16 +14,17 @@ Copyright Microsoft Corporation. All Rights Reserved.
 namespace Standard
 {
 	using System;
+	using System.Collections.Generic;
+	using System.Diagnostics.CodeAnalysis;
 	using System.Runtime.InteropServices;
 	using System.Windows;
 	using System.Windows.Threading;
-	using System.Collections.Generic;
-	using System.Diagnostics.CodeAnalysis;
 
 	internal sealed class MessageWindow : DispatcherObject, IDisposable
 	{
 		// Alias this to a static so the wrapper doesn't get GC'd
 		private static readonly WndProc s_WndProc = new WndProc(_WndProc);
+
 		private static readonly Dictionary<IntPtr, MessageWindow> s_windowLookup = new Dictionary<IntPtr, MessageWindow>();
 
 		private WndProc _wndProcCallback;
@@ -104,13 +105,13 @@ private void _Dispose(bool disposing, bool isHwndBeingDestroyed)
 			var className = _className;
 
 			if (isHwndBeingDestroyed)
-				Dispatcher.BeginInvoke(DispatcherPriority.Normal, (DispatcherOperationCallback) (arg => _DestroyWindow(IntPtr.Zero, className)));
+				Dispatcher.BeginInvoke(DispatcherPriority.Normal, (DispatcherOperationCallback)(arg => _DestroyWindow(IntPtr.Zero, className)));
 			else if (Handle != IntPtr.Zero)
 			{
 				if (CheckAccess())
 					_DestroyWindow(hwnd, className);
 				else
-					Dispatcher.BeginInvoke(DispatcherPriority.Normal, (DispatcherOperationCallback) (arg => _DestroyWindow(hwnd, className)));
+					Dispatcher.BeginInvoke(DispatcherPriority.Normal, (DispatcherOperationCallback)(arg => _DestroyWindow(hwnd, className)));
 			}
 			s_windowLookup.Remove(hwnd);
 			_className = null;
@@ -159,4 +160,4 @@ private static object _DestroyWindow(IntPtr hwnd, string className)
 			return null;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/Standard/NamespaceDoc.cs b/source/Components/AvalonDock/Controls/Shell/Standard/NamespaceDoc.cs
index 8c440386..1c66f246 100644
--- a/source/Components/AvalonDock/Controls/Shell/Standard/NamespaceDoc.cs
+++ b/source/Components/AvalonDock/Controls/Shell/Standard/NamespaceDoc.cs
@@ -5,4 +5,4 @@ namespace AvalonDock.Controls.Shell.Standard
 	internal class NamespaceDoc
 	{
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/Standard/NativeMethods.cs b/source/Components/AvalonDock/Controls/Shell/Standard/NativeMethods.cs
index e316c251..71a28837 100644
--- a/source/Components/AvalonDock/Controls/Shell/Standard/NativeMethods.cs
+++ b/source/Components/AvalonDock/Controls/Shell/Standard/NativeMethods.cs
@@ -13,6 +13,7 @@ Copyright Microsoft Corporation. All Rights Reserved.
 
 namespace Standard
 {
+	using Microsoft.Win32.SafeHandles;
 	using System;
 	using System.ComponentModel;
 	using System.Diagnostics.CodeAnalysis;
@@ -22,12 +23,9 @@ namespace Standard
 	using System.Runtime.InteropServices.ComTypes;
 	using System.Security.Permissions;
 	using System.Text;
-	using Microsoft.Win32.SafeHandles;
 
 	// Some COM interfaces and Win32 structures are already declared in the framework.
 	// Interesting ones to remember in System.Runtime.InteropServices.ComTypes are:
-	using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
-	using IPersistFile = System.Runtime.InteropServices.ComTypes.IPersistFile;
 	using IStream = System.Runtime.InteropServices.ComTypes.IStream;
 
 	#region Native Values
@@ -75,18 +73,22 @@ internal enum RGN
 		/// Creates the intersection of the two combined regions.
 		/// </summary>
 		AND = 1,
+
 		/// <summary>
 		/// Creates the union of two combined regions.
 		/// </summary>
 		OR = 2,
+
 		/// <summary>
 		/// Creates the union of two combined regions except for any overlapping areas.
 		/// </summary>
 		XOR = 3,
+
 		/// <summary>
 		/// Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
 		/// </summary>
 		DIFF = 4,
+
 		/// <summary>
 		/// Creates a copy of the region identified by hrgnSrc1.
 		/// </summary>
@@ -192,7 +194,7 @@ internal enum OLECMDID
 	/// <summary>
 	/// For IWebBrowser2.  READYSTATE_*
 	/// </summary>
-	enum READYSTATE
+	internal enum READYSTATE
 	{
 		UNINITIALIZED = 0,
 		LOADING = 1,
@@ -224,25 +226,29 @@ internal enum ErrorModes
 	{
 		/// <summary>Use the system default, which is to display all error dialog boxes.</summary>
 		Default = 0x0,
+
 		/// <summary>
-		/// The system does not display the critical-error-handler message box. 
+		/// The system does not display the critical-error-handler message box.
 		/// Instead, the system sends the error to the calling process.
 		/// </summary>
 		FailCriticalErrors = 0x1,
+
 		/// <summary>
-		/// 64-bit Windows:  The system automatically fixes memory alignment faults and makes them 
+		/// 64-bit Windows:  The system automatically fixes memory alignment faults and makes them
 		/// invisible to the application. It does this for the calling process and any descendant processes.
 		/// After this value is set for a process, subsequent attempts to clear the value are ignored.
 		/// </summary>
 		NoGpFaultErrorBox = 0x2,
+
 		/// <summary>
-		/// The system does not display the general-protection-fault message box. 
-		/// This flag should only be set by debugging applications that handle general 
+		/// The system does not display the general-protection-fault message box.
+		/// This flag should only be set by debugging applications that handle general
 		/// protection (GP) faults themselves with an exception handler.
 		/// </summary>
 		NoAlignmentFaultExcept = 0x4,
+
 		/// <summary>
-		/// The system does not display a message box when it fails to find a file. 
+		/// The system does not display a message box when it fails to find a file.
 		/// Instead, the error is returned to the calling process.
 		/// </summary>
 		NoOpenFileErrorBox = 0x8000
@@ -905,16 +911,20 @@ internal enum WM
 		DWMWINDOWMAXIMIZEDCHANGE = 0x0321,
 
 		GETTITLEBARINFOEX = 0x033F,
+
 		#region Windows 7
+
 		DWMSENDICONICTHUMBNAIL = 0x0323,
 		DWMSENDICONICLIVEPREVIEWBITMAP = 0x0326,
-		#endregion
+
+		#endregion Windows 7
 
 		USER = 0x0400,
 
 		// This is the hard-coded message value used by WinForms for Shell_NotifyIcon.
 		// It's relatively safe to reuse.
 		TRAYMOUSEMESSAGE = 0x800, //WM_USER + 1024
+
 		APP = 0x8000,
 	}
 
@@ -961,14 +971,17 @@ internal enum DeviceCap
 		/// <summary>Number of bits per pixel
 		/// </summary>
 		BITSPIXEL = 12,
+
 		/// <summary>
 		/// Number of planes
 		/// </summary>
 		PLANES = 14,
+
 		/// <summary>
 		/// Logical pixels inch in X
 		/// </summary>
 		LOGPIXELSX = 88,
+
 		/// <summary>
 		/// Logical pixels inch in Y
 		/// </summary>
@@ -1016,6 +1029,7 @@ internal enum MF : uint
 		/// Possible return value for EnableMenuItem
 		/// </summary>
 		DOES_NOT_EXIST = unchecked((uint)-1),
+
 		ENABLED = 0,
 		BYCOMMAND = 0,
 		GRAYED = 1,
@@ -1083,19 +1097,21 @@ internal enum WTNCA : uint
 	{
 		/// <summary>Prevents the window caption from being drawn.</summary>
 		NODRAWCAPTION = 0x00000001,
+
 		/// <summary>Prevents the system icon from being drawn.</summary>
 		NODRAWICON = 0x00000002,
+
 		/// <summary>Prevents the system icon menu from appearing.</summary>
 		NOSYSMENU = 0x00000004,
+
 		/// <summary>Prevents mirroring of the question mark, even in right-to-left (RTL) layout.</summary>
 		NOMIRRORHELP = 0x00000008,
+
 		/// <summary> A mask that contains all the valid bits.</summary>
 		VALIDBITS = NODRAWCAPTION | NODRAWICON | NOMIRRORHELP | NOSYSMENU,
 	}
 
-	/// <summary>
-	/// SetWindowPos options
-	/// </summary>
+	/// <summary>SetWindowPos options</summary>
 	[Flags]
 	internal enum SWP
 	{
@@ -1159,17 +1175,15 @@ internal enum SC
 		MONITORPOWER = 0xF170,
 		CONTEXTHELP = 0xF180,
 		SEPARATOR = 0xF00F,
-		/// <summary>
-		/// SCF_ISSECURE
-		/// </summary>
+
+		/// <summary>SCF_ISSECURE</summary>
 		F_ISSECURE = 0x00000001,
+
 		ICON = MINIMIZE,
 		ZOOM = MAXIMIZE,
 	}
 
-	/// <summary>
-	/// GDI+ Status codes
-	/// </summary>
+	/// <summary>GDI+ Status codes</summary>
 	internal enum Status
 	{
 		Ok = 0,
@@ -1200,6 +1214,7 @@ internal enum MOUSEEVENTF : int
 	{
 		//mouse event constants
 		LEFTDOWN = 2,
+
 		LEFTUP = 4
 	}
 
@@ -1210,6 +1225,7 @@ internal enum MSGFLT
 	{
 		// Win7 versions of this enum:
 		RESET = 0,
+
 		ALLOW = 1,
 		DISALLOW = 2,
 
@@ -1231,9 +1247,7 @@ internal enum INPUT_TYPE : uint
 		MOUSE = 0,
 	}
 
-	/// <summary>
-	/// Shell_NotifyIcon messages.  NIM_*
-	/// </summary>
+	/// <summary>Shell_NotifyIcon messages.  NIM_*</summary>
 	internal enum NIM : uint
 	{
 		ADD = 0,
@@ -1243,9 +1257,7 @@ internal enum NIM : uint
 		SETVERSION = 4,
 	}
 
-	/// <summary>
-	/// SHAddToRecentDocuments flags.  SHARD_*
-	/// </summary>
+	/// <summary>SHAddToRecentDocuments flags.  SHARD_*</summary>
 	internal enum SHARD
 	{
 		PIDL = 0x00000001,
@@ -1254,20 +1266,18 @@ internal enum SHARD
 		APPIDINFO = 0x00000004, // indicates the data type is a pointer to a SHARDAPPIDINFO structure
 		APPIDINFOIDLIST = 0x00000005, // indicates the data type is a pointer to a SHARDAPPIDINFOIDLIST structure
 		LINK = 0x00000006, // indicates the data type is a pointer to an IShellLink instance
-		APPIDINFOLINK = 0x00000007, // indicates the data type is a pointer to a SHARDAPPIDINFOLINK structure 
+		APPIDINFOLINK = 0x00000007, // indicates the data type is a pointer to a SHARDAPPIDINFOLINK structure
 	}
 
 	[Flags]
-	enum SLGP
+	internal enum SLGP
 	{
 		SHORTPATH = 0x1,
 		UNCPRIORITY = 0x2,
 		RAWPATH = 0x4
 	}
 
-	/// <summary>
-	/// Shell_NotifyIcon flags.  NIF_*
-	/// </summary>
+	/// <summary>Shell_NotifyIcon flags.  NIF_*</summary>
 	[Flags]
 	internal enum NIF : uint
 	{
@@ -1282,6 +1292,7 @@ internal enum NIF : uint
 		/// Vista only.
 		/// </summary>
 		REALTIME = 0x0040,
+
 		/// <summary>
 		/// Vista only.
 		/// </summary>
@@ -1300,14 +1311,19 @@ internal enum NIIF
 		INFO = 0x00000001,
 		WARNING = 0x00000002,
 		ERROR = 0x00000003,
+
 		/// <summary>XP SP2 and later.</summary>
 		USER = 0x00000004,
+
 		/// <summary>XP and later.</summary>
 		NOSOUND = 0x00000010,
+
 		/// <summary>Vista and later.</summary>
 		LARGE_ICON = 0x00000020,
+
 		/// <summary>Windows 7 and later</summary>
 		NIIF_RESPECT_QUIET_TIME = 0x00000080,
+
 		/// <summary>XP and later.  Native version called NIIF_ICON_MASK.</summary>
 		XP_ICON_MASK = 0x0000000F,
 	}
@@ -1340,7 +1356,7 @@ internal enum WVR
 		REDRAW = HREDRAW | VREDRAW,
 	}
 
-	#endregion
+	#endregion Native Values
 
 	#region SafeHandles
 
@@ -1392,7 +1408,9 @@ public IntPtr Hwnd
 			}
 		}
 
-		private SafeDC() : base(true) { }
+		private SafeDC() : base(true)
+		{
+		}
 
 		/// <inheritdoc />
 		[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
@@ -1468,13 +1486,15 @@ public static SafeDC GetDesktop()
 		public static SafeDC WrapDC(IntPtr hdc)
 		{
 			// This won't actually get released by the class, but it allows an IntPtr to be converted for signatures.
-			return new SafeDC {handle = hdc, _created = false, _hwnd = IntPtr.Zero};
+			return new SafeDC { handle = hdc, _created = false, _hwnd = IntPtr.Zero };
 		}
 	}
 
 	internal sealed class SafeHBITMAP : SafeHandleZeroOrMinusOneIsInvalid
 	{
-		private SafeHBITMAP() : base(true) { }
+		private SafeHBITMAP() : base(true)
+		{
+		}
 
 		/// <inheritdoc />
 		[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
@@ -1483,7 +1503,9 @@ private SafeHBITMAP() : base(true) { }
 
 	internal sealed class SafeGdiplusStartupToken : SafeHandleZeroOrMinusOneIsInvalid
 	{
-		private SafeGdiplusStartupToken() : base(true) { }
+		private SafeGdiplusStartupToken() : base(true)
+		{
+		}
 
 		/// <inheritdoc />
 		[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
@@ -1573,7 +1595,7 @@ protected override bool ReleaseHandle()
 		}
 	}
 
-	#endregion
+	#endregion SafeHandles
 
 	#region Native Types
 
@@ -1582,10 +1604,13 @@ internal struct BLENDFUNCTION
 	{
 		// Must be AC_SRC_OVER
 		public AC BlendOp;
+
 		// Must be 0.
 		public byte BlendFlags;
+
 		// Alpha transparency between 0 (transparent) - 255 (opaque)
 		public byte SourceConstantAlpha;
+
 		// Must be AC_SRC_ALPHA
 		public AC AlphaFormat;
 	}
@@ -1595,6 +1620,7 @@ internal struct HIGHCONTRAST
 	{
 		public int cbSize;
 		public HCF dwFlags;
+
 		//[MarshalAs(UnmanagedType.LPWStr, SizeConst=80)]
 		//public String lpszDefaultScheme;
 		public IntPtr lpszDefaultScheme;
@@ -1652,10 +1678,13 @@ internal struct CREATESTRUCT
 		public int y;
 		public int x;
 		public WS style;
+
 		[MarshalAs(UnmanagedType.LPWStr)]
 		public string lpszName;
+
 		[MarshalAs(UnmanagedType.LPWStr)]
 		public string lpszClass;
+
 		public WS_EX dwExStyle;
 	}
 
@@ -1663,15 +1692,21 @@ internal struct CREATESTRUCT
 	internal struct SHFILEOPSTRUCT
 	{
 		public IntPtr hwnd;
+
 		[MarshalAs(UnmanagedType.U4)]
 		public FO wFunc;
+
 		// double-null terminated arrays of LPWSTRS
 		public string pFrom;
+
 		public string pTo;
+
 		[MarshalAs(UnmanagedType.U2)]
 		public FOF fFlags;
+
 		[MarshalAs(UnmanagedType.Bool)]
 		public int fAnyOperationsAborted;
+
 		public IntPtr hNameMappings;
 		public string lpszProgressTitle;
 	}
@@ -1719,25 +1754,33 @@ internal class NOTIFYICONDATA
 		public NIF uFlags;
 		public int uCallbackMessage;
 		public IntPtr hIcon;
+
 		[MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
 		public char[] szTip = new char[128];
+
 		/// <summary>
 		/// The state of the icon.  There are two flags that can be set independently.
 		/// NIS_HIDDEN = 1.  The icon is hidden.
 		/// NIS_SHAREDICON = 2.  The icon is shared.
 		/// </summary>
 		public uint dwState;
+
 		public uint dwStateMask;
+
 		[MarshalAs(UnmanagedType.ByValArray, SizeConst = 256)]
 		public char[] szInfo = new char[256];
+
 		// Prior to Vista this was a union of uTimeout and uVersion.  As of Vista, uTimeout has been deprecated.
 		public uint uVersion;  // Used with Shell_NotifyIcon flag NIM_SETVERSION.
+
 		[MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
 		public char[] szInfoTitle = new char[64];
+
 		public uint dwInfoFlags;
 		public Guid guidItem;
+
 		// Vista only
-		IntPtr hBalloonIcon;
+		private IntPtr hBalloonIcon;
 	}
 
 	[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
@@ -1753,16 +1796,20 @@ private static class NativeMethods
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		[FieldOffset(0)]
 		private ushort vt;
+
 		[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		[FieldOffset(8)]
 		private IntPtr pointerVal;
+
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		[FieldOffset(8)]
 		private byte byteVal;
+
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		[FieldOffset(8)]
 		private long longVal;
+
 		[SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
 		[FieldOffset(8)]
 		private short boolVal;
@@ -1815,7 +1862,7 @@ private void Dispose(bool disposing)
 			Clear();
 		}
 
-		#endregion
+		#endregion IDisposable Pattern
 	}
 
 	[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
@@ -1823,9 +1870,10 @@ private void Dispose(bool disposing)
 	internal class SHARDAPPIDINFO
 	{
 		[MarshalAs(UnmanagedType.Interface)]
-		object psi;    // The namespace location of the the item that should be added to the recent docs folder.
+		private object psi;    // The namespace location of the the item that should be added to the recent docs folder.
+
 		[MarshalAs(UnmanagedType.LPWStr)]
-		string pszAppID;  // The id of the application that should be associated with this recent doc.
+		private string pszAppID;  // The id of the application that should be associated with this recent doc.
 	}
 
 	[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
@@ -1833,24 +1881,25 @@ internal class SHARDAPPIDINFO
 	internal class SHARDAPPIDINFOIDLIST
 	{
 		/// <summary>The idlist for the shell item that should be added to the recent docs folder.</summary>
-		IntPtr pidl;
+		private IntPtr pidl;
+
 		/// <summary>The id of the application that should be associated with this recent doc.</summary>
 		[MarshalAs(UnmanagedType.LPWStr)]
-		string pszAppID;
+		private string pszAppID;
 	}
 
 	[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
 	[StructLayout(LayoutKind.Sequential, Pack = 4)]
 	internal class SHARDAPPIDINFOLINK
 	{
-		IntPtr psl;     // An IShellLink instance that when launched opens a recently used item in the specified 
-						// application. This link is not added to the recent docs folder, but will be added to the
-						// specified application's destination list.
+		private IntPtr psl;     // An IShellLink instance that when launched opens a recently used item in the specified
+
+		// application. This link is not added to the recent docs folder, but will be added to the
+		// specified application's destination list.
 		[MarshalAs(UnmanagedType.LPWStr)]
-		string pszAppID;  // The id of the application that should be associated with this recent doc.
+		private string pszAppID;  // The id of the application that should be associated with this recent doc.
 	}
 
-
 	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
 	internal struct LOGFONT
 	{
@@ -1867,6 +1916,7 @@ internal struct LOGFONT
 		public byte lfClipPrecision;
 		public byte lfQuality;
 		public byte lfPitchAndFamily;
+
 		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
 		public string lfFaceName;
 	}
@@ -1899,6 +1949,7 @@ internal struct NONCLIENTMETRICS
 		public LOGFONT lfMenuFont;
 		public LOGFONT lfStatusFont;
 		public LOGFONT lfMessageFont;
+
 		// Vista only
 		public int iPaddedBorderWidth;
 
@@ -1907,11 +1958,11 @@ public static NONCLIENTMETRICS VistaMetricsStruct
 		{
 			get
 			{
-                var ncm = new NONCLIENTMETRICS
-                {
-                    cbSize = Marshal.SizeOf(typeof(NONCLIENTMETRICS))
-                };
-                return ncm;
+				var ncm = new NONCLIENTMETRICS
+				{
+					cbSize = Marshal.SizeOf(typeof(NONCLIENTMETRICS))
+				};
+				return ncm;
 			}
 		}
 
@@ -1920,12 +1971,12 @@ public static NONCLIENTMETRICS XPMetricsStruct
 		{
 			get
 			{
-                var ncm = new NONCLIENTMETRICS
-                {
-                    // Account for the missing iPaddedBorderWidth
-                    cbSize = Marshal.SizeOf(typeof(NONCLIENTMETRICS)) - sizeof(int)
-                };
-                return ncm;
+				var ncm = new NONCLIENTMETRICS
+				{
+					// Account for the missing iPaddedBorderWidth
+					cbSize = Marshal.SizeOf(typeof(NONCLIENTMETRICS)) - sizeof(int)
+				};
+				return ncm;
 			}
 		}
 	}
@@ -1960,10 +2011,13 @@ internal struct MARGINS
 	{
 		/// <summary>Width of left border that retains its size.</summary>
 		public int cxLeftWidth;
+
 		/// <summary>Width of right border that retains its size.</summary>
 		public int cxRightWidth;
+
 		/// <summary>Height of top border that retains its size.</summary>
 		public int cyTopHeight;
+
 		/// <summary>Height of bottom border that retains its size.</summary>
 		public int cyBottomHeight;
 	};
@@ -2019,7 +2073,7 @@ public void Offset(int dx, int dy)
 		public int Top { get => _top; set => _top = value; }
 
 		[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-		public int Bottom { get => _bottom; set => _bottom = value;		}
+		public int Bottom { get => _bottom; set => _bottom = value; }
 
 		[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
 		public int Width => _right - _left;
@@ -2149,8 +2203,10 @@ internal class WIN32_FIND_DATAW
 		public int nFileSizeLow;
 		public int dwReserved0;
 		public int dwReserved1;
+
 		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
 		public string cFileName;
+
 		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 14)]
 		public string cAlternateFileName;
 	}
@@ -2190,10 +2246,13 @@ internal struct WNDCLASSEX
 		public IntPtr hIcon;
 		public IntPtr hCursor;
 		public IntPtr hbrBackground;
+
 		[MarshalAs(UnmanagedType.LPWStr)]
 		public string lpszMenuName;
+
 		[MarshalAs(UnmanagedType.LPWStr)]
 		public string lpszClassName;
+
 		public IntPtr hIconSm;
 	}
 
@@ -2267,7 +2326,7 @@ internal struct DWM_TIMING_INFO
 		public ulong cBuffersEmpty;
 	}
 
-	#endregion
+	#endregion Native Types
 
 	/// <summary>Delegate declaration that matches native WndProc signatures.</summary>
 	internal delegate IntPtr WndProc(IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam);
@@ -2324,12 +2383,12 @@ public static HRESULT ChangeWindowMessageFilterEx(IntPtr hwnd, WM message, MSGFL
 			{
 				// Note that the Win7 MSGFLT_ALLOW/DISALLOW enum values map to the Vista MSGFLT_ADD/REMOVE
 				ret = _ChangeWindowMessageFilter(message, action);
-				return !ret ? (HRESULT) Win32Error.GetLastError() : HRESULT.S_OK;
+				return !ret ? (HRESULT)Win32Error.GetLastError() : HRESULT.S_OK;
 			}
 
 			var filterstruct = new CHANGEFILTERSTRUCT { cbSize = (uint)Marshal.SizeOf(typeof(CHANGEFILTERSTRUCT)) };
 			ret = _ChangeWindowMessageFilterEx(hwnd, message, action, ref filterstruct);
-			if (!ret) return (HRESULT) Win32Error.GetLastError();
+			if (!ret) return (HRESULT)Win32Error.GetLastError();
 
 			filterInfo = filterstruct.ExtStatus;
 			return HRESULT.S_OK;
@@ -2635,7 +2694,7 @@ private static extern HRESULT _GetCurrentThemeName(
 
 		public static void GetCurrentThemeName(out string themeFileName, out string color, out string size)
 		{
-			// Not expecting strings longer than MAX_PATH.  We will return the error 
+			// Not expecting strings longer than MAX_PATH.  We will return the error
 			var fileNameBuilder = new StringBuilder((int)Win32Value.MAX_PATH);
 			var colorBuilder = new StringBuilder((int)Win32Value.MAX_PATH);
 			var sizeBuilder = new StringBuilder((int)Win32Value.MAX_PATH);
@@ -2926,7 +2985,7 @@ public static void SetProcessWorkingSetSize(IntPtr hProcess, int dwMinimumWorkin
 
 		// This is aliased as a macro in 32bit Windows.
 		[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-		public static IntPtr SetWindowLongPtr(IntPtr hwnd, GWL nIndex, IntPtr dwNewLong) 
+		public static IntPtr SetWindowLongPtr(IntPtr hwnd, GWL nIndex, IntPtr dwNewLong)
 			=> IntPtr.Size == 8 ? SetWindowLongPtr64(hwnd, nIndex, dwNewLong) : new IntPtr(SetWindowLongPtr32(hwnd, nIndex, dwNewLong.ToInt32()));
 
 		[SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
@@ -2955,7 +3014,7 @@ public static void SetWindowRgn(IntPtr hWnd, IntPtr hRgn, bool bRedraw)
 		private static extern bool _SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, SWP uFlags);
 
 		[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-		public static bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, SWP uFlags) 
+		public static bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, SWP uFlags)
 			=> _SetWindowPos(hWnd, hWndInsertAfter, x, y, cx, cy, uFlags);
 
 		[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
@@ -3109,7 +3168,7 @@ public static void UpdateLayeredWindow(
 		[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
 		public static void UpdateLayeredWindow(IntPtr hwnd, int crKey, ref BLENDFUNCTION pblend, ULW dwFlags)
 		{
-			if (!_UpdateLayeredWindowIntPtr(hwnd, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, crKey, ref pblend, dwFlags)) 
+			if (!_UpdateLayeredWindowIntPtr(hwnd, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, crKey, ref pblend, dwFlags))
 				HRESULT.ThrowLastError();
 		}
 
@@ -3127,7 +3186,7 @@ public static void UpdateLayeredWindow(IntPtr hwnd, int crKey, ref BLENDFUNCTION
 
 		// Win7 only.
 		public static void SHAddToRecentDocs(IShellLinkW shellLink) => _SHAddToRecentDocs_ShellLink(SHARD.LINK, shellLink);
-		
+
 		// #define DWM_SIT_DISPLAYFRAME    0x00000001  // Display a window frame around the provided bitmap
 
 		[DllImport("dwmapi.dll", EntryPoint = "DwmGetCompositionTimingInfo")]
@@ -3184,6 +3243,6 @@ public static void UpdateLayeredWindow(IntPtr hwnd, int crKey, ref BLENDFUNCTION
 		[DllImport("shell32.dll")]
 		public static extern HRESULT GetCurrentProcessExplicitAppUserModelID([Out, MarshalAs(UnmanagedType.LPWStr)] out string AppID);
 
-		#endregion
+		#endregion Win7 declarations
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/Standard/ShellProvider.cs b/source/Components/AvalonDock/Controls/Shell/Standard/ShellProvider.cs
index 1f8a06d2..133d8346 100644
--- a/source/Components/AvalonDock/Controls/Shell/Standard/ShellProvider.cs
+++ b/source/Components/AvalonDock/Controls/Shell/Standard/ShellProvider.cs
@@ -88,6 +88,7 @@ internal enum THBF : uint
 		DISMISSONCLICK = 0x0002,
 		NOBACKGROUND = 0x0004,
 		HIDDEN = 0x0008,
+
 		// Added post-beta
 		NONINTERACTIVE = 0x0010,
 	}
@@ -112,6 +113,7 @@ internal enum GPS
 		//
 		// Specifying other GPS_ flags modifies the store that is returned
 		DEFAULT = 0x00000000,
+
 		HANDLERPROPERTIESONLY = 0x00000001,   // only include properties directly from the file's property handler
 		READWRITE = 0x00000002,   // Writable stores will only include handler properties
 		TEMPORARY = 0x00000004,   // A read/write store that only holds properties for the lifetime of the IShellItem object
@@ -139,13 +141,15 @@ internal enum SFGAO : uint
 		/// <summary>Objects can be copied</summary>
 		/// <remarks>DROPEFFECT_COPY</remarks>
 		CANCOPY = 0x1,
+
 		/// <summary>Objects can be moved</summary>
 		/// <remarks>DROPEFFECT_MOVE</remarks>
 		CANMOVE = 0x2,
+
 		/// <summary>Objects can be linked</summary>
 		/// <remarks>
 		/// DROPEFFECT_LINK.
-		/// 
+		///
 		/// If this bit is set on an item in the shell folder, a
 		/// 'Create Shortcut' menu item will be added to the File
 		/// menu and context menus for the item.  If the user selects
@@ -156,12 +160,16 @@ internal enum SFGAO : uint
 		/// folder.
 		/// </remarks>
 		CANLINK = 0x4,
+
 		/// <summary>supports BindToObject(IID_IStorage)</summary>
 		STORAGE = 0x00000008,
+
 		/// <summary>Objects can be renamed</summary>
 		CANRENAME = 0x00000010,
+
 		/// <summary>Objects can be deleted</summary>
 		CANDELETE = 0x00000020,
+
 		/// <summary>Objects have property sheets</summary>
 		HASPROPSHEET = 0x00000040,
 
@@ -169,57 +177,83 @@ internal enum SFGAO : uint
 
 		/// <summary>Objects are drop target</summary>
 		DROPTARGET = 0x00000100,
+
 		CAPABILITYMASK = 0x00000177,
+
 		// unused = 0x00000200,
 		// unused = 0x00000400,
 		// unused = 0x00000800,
 		// unused = 0x00001000,
 		/// <summary>Object is encrypted (use alt color)</summary>
 		ENCRYPTED = 0x00002000,
+
 		/// <summary>'Slow' object</summary>
 		ISSLOW = 0x00004000,
+
 		/// <summary>Ghosted icon</summary>
 		GHOSTED = 0x00008000,
+
 		/// <summary>Shortcut (link)</summary>
 		LINK = 0x00010000,
+
 		/// <summary>Shared</summary>
 		SHARE = 0x00020000,
+
 		/// <summary>Read-only</summary>
 		READONLY = 0x00040000,
+
 		/// <summary> Hidden object</summary>
 		HIDDEN = 0x00080000,
+
 		DISPLAYATTRMASK = 0x000FC000,
+
 		/// <summary> May contain children with SFGAO_FILESYSTEM</summary>
 		FILESYSANCESTOR = 0x10000000,
+
 		/// <summary>Support BindToObject(IID_IShellFolder)</summary>
 		FOLDER = 0x20000000,
+
 		/// <summary>Is a win32 file system object (file/folder/root)</summary>
 		FILESYSTEM = 0x40000000,
+
 		/// <summary>May contain children with SFGAO_FOLDER (may be slow)</summary>
 		HASSUBFOLDER = 0x80000000,
+
 		CONTENTSMASK = 0x80000000,
+
 		/// <summary>Invalidate cached information (may be slow)</summary>
 		VALIDATE = 0x01000000,
+
 		/// <summary>Is this removeable media?</summary>
 		REMOVABLE = 0x02000000,
+
 		/// <summary> Object is compressed (use alt color)</summary>
 		COMPRESSED = 0x04000000,
+
 		/// <summary>Supports IShellFolder, but only implements CreateViewObject() (non-folder view)</summary>
 		BROWSABLE = 0x08000000,
+
 		/// <summary>Is a non-enumerated object (should be hidden)</summary>
 		NONENUMERATED = 0x00100000,
+
 		/// <summary>Should show bold in explorer tree</summary>
 		NEWCONTENT = 0x00200000,
+
 		/// <summary>Obsolete</summary>
 		CANMONIKER = 0x00400000,
+
 		/// <summary>Obsolete</summary>
 		HASSTORAGE = 0x00400000,
+
 		/// <summary>Supports BindToObject(IID_IStream)</summary>
 		STREAM = 0x00400000,
+
 		/// <summary>May contain children with SFGAO_STORAGE or SFGAO_STREAM</summary>
 		STORAGEANCESTOR = 0x00800000,
+
 		/// <summary>For determining storage capabilities, ie for open/save semantics</summary>
 		STORAGECAPMASK = 0x70C50008,
+
 		/// <summary>
 		/// Attributes that are masked out for PKEY_SFGAOFlags because they are considered
 		/// to cause slow calculations or lack context
@@ -270,10 +304,13 @@ internal enum SICHINT : uint
 	{
 		/// <summary>iOrder based on display in a folder view</summary>
 		DISPLAY = 0x00000000,
+
 		/// <summary>exact instance compare</summary>
 		ALLFIELDS = 0x80000000,
+
 		/// <summary>iOrder based on canonical name (better performance)</summary>
 		CANONICAL = 0x10000000,
+
 		TEST_FILESYSPATH_IF_NOT_EQUAL = 0x20000000,
 	};
 
@@ -321,7 +358,7 @@ internal static class STR_GPS
 		public const string NO_OPLOCK = "GPS_NO_OPLOCK";
 	}
 
-	#endregion
+	#endregion Enums and Static Property Classes
 
 	#region Structs
 
@@ -337,17 +374,19 @@ internal struct THUMBBUTTON
 		public uint iId;
 		public uint iBitmap;
 		public IntPtr hIcon;
+
 		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
 		public string szTip;
+
 		public THBF dwFlags;
 	}
 
-
 	[StructLayout(LayoutKind.Sequential, Pack = 4)]
 	internal struct PKEY
 	{
 		/// <summary>fmtid</summary>
 		private readonly Guid _fmtid;
+
 		/// <summary>pid</summary>
 		private readonly uint _pid;
 
@@ -359,19 +398,24 @@ public PKEY(Guid fmtid, uint pid)
 
 		/// <summary>PKEY_Title</summary>
 		public static readonly PKEY Title = new PKEY(new Guid("F29F85E0-4FF9-1068-AB91-08002B27B3D9"), 2);
+
 		/// <summary>PKEY_AppUserModel_ID</summary>
 		public static readonly PKEY AppUserModel_ID = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 5);
+
 		/// <summary>PKEY_AppUserModel_IsDestListSeparator</summary>
 		public static readonly PKEY AppUserModel_IsDestListSeparator = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 6);
+
 		/// <summary>PKEY_AppUserModel_RelaunchCommand</summary>
 		public static readonly PKEY AppUserModel_RelaunchCommand = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 2);
+
 		/// <summary>PKEY_AppUserModel_RelaunchDisplayNameResource</summary>
 		public static readonly PKEY AppUserModel_RelaunchDisplayNameResource = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 4);
+
 		/// <summary>PKEY_AppUserModel_RelaunchIconResource</summary>
 		public static readonly PKEY AppUserModel_RelaunchIconResource = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 3);
 	}
 
-	#endregion
+	#endregion Structs
 
 	#region Interfaces
 
@@ -384,9 +428,12 @@ internal interface IEnumIDList
 	{
 		[PreserveSig()]
 		HRESULT Next(uint celt, out IntPtr rgelt, out int pceltFetched);
+
 		[PreserveSig()]
 		HRESULT Skip(uint celt);
+
 		void Reset();
+
 		void Clone([Out, MarshalAs(UnmanagedType.Interface)] out IEnumIDList ppenum);
 	}
 
@@ -425,6 +472,7 @@ internal interface IEnumObjects
 	internal interface IObjectArray
 	{
 		uint GetCount();
+
 		[return: MarshalAs(UnmanagedType.IUnknown)]
 		object GetAt([In] uint uiIndex, [In] ref Guid riid);
 	}
@@ -434,17 +482,23 @@ internal interface IObjectArray
 		InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
 		Guid(IID.ObjectArray),
 	]
-	interface IObjectCollection : IObjectArray
+	internal interface IObjectCollection : IObjectArray
 	{
 		#region IObjectArray redeclarations
+
 		new uint GetCount();
+
 		[return: MarshalAs(UnmanagedType.IUnknown)]
 		new object GetAt([In] uint uiIndex, [In] ref Guid riid);
-		#endregion
+
+		#endregion IObjectArray redeclarations
 
 		void AddObject([MarshalAs(UnmanagedType.IUnknown)] object punk);
+
 		void AddFromArray(IObjectArray poaSource);
+
 		void RemoveObjectAt(uint uiIndex);
+
 		void Clear();
 	}
 
@@ -456,9 +510,13 @@ interface IObjectCollection : IObjectArray
 	internal interface IPropertyStore
 	{
 		uint GetCount();
+
 		PKEY GetAt(uint iProp);
+
 		void GetValue([In] ref PKEY pkey, [In, Out] PROPVARIANT pv);
+
 		void SetValue([In] ref PKEY pkey, PROPVARIANT pv);
+
 		void Commit();
 	}
 
@@ -613,17 +671,23 @@ internal interface IShellItemArray
 		InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
 		Guid(IID.ShellItem2),
 	]
-	interface IShellItem2 : IShellItem
+	internal interface IShellItem2 : IShellItem
 	{
 		#region IShellItem redeclarations
+
 		[return: MarshalAs(UnmanagedType.Interface)]
 		new object BindToHandler([In] IBindCtx pbc, [In] ref Guid bhid, [In] ref Guid riid);
+
 		new IShellItem GetParent();
+
 		[return: MarshalAs(UnmanagedType.LPWStr)]
 		new string GetDisplayName(SIGDN sigdnName);
+
 		new SFGAO GetAttributes(SFGAO sfgaoMask);
+
 		new int Compare(IShellItem psi, SICHINT hint);
-		#endregion
+
+		#endregion IShellItem redeclarations
 
 		[return: MarshalAs(UnmanagedType.Interface)]
 		object GetPropertyStore(
@@ -678,22 +742,39 @@ object GetPropertyDescriptionList(
 	internal interface IShellLinkW
 	{
 		void GetPath([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, int cchMaxPath, [In, Out] WIN32_FIND_DATAW pfd, SLGP fFlags);
+
 		void GetIDList(out IntPtr ppidl);
+
 		void SetIDList(IntPtr pidl);
+
 		void GetDescription([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, int cchMaxName);
+
 		void SetDescription([MarshalAs(UnmanagedType.LPWStr)] string pszName);
+
 		void GetWorkingDirectory([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszDir, int cchMaxPath);
+
 		void SetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)] string pszDir);
+
 		void GetArguments([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszArgs, int cchMaxPath);
+
 		void SetArguments([MarshalAs(UnmanagedType.LPWStr)] string pszArgs);
+
 		short GetHotKey();
+
 		void SetHotKey(short wHotKey);
+
 		uint GetShowCmd();
+
 		void SetShowCmd(uint iShowCmd);
+
 		void GetIconLocation([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszIconPath, int cchIconPath, out int piIcon);
+
 		void SetIconLocation([MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, int iIcon);
+
 		void SetRelativePath([MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, uint dwReserved);
+
 		void Resolve(IntPtr hwnd, uint fFlags);
+
 		void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile);
 	}
 
@@ -742,12 +823,18 @@ internal interface ITaskbarList
 	internal interface ITaskbarList2 : ITaskbarList
 	{
 		#region ITaskbarList redeclaration
+
 		new void HrInit();
+
 		new void AddTab(IntPtr hwnd);
+
 		new void DeleteTab(IntPtr hwnd);
+
 		new void ActivateTab(IntPtr hwnd);
+
 		new void SetActiveAlt(IntPtr hwnd);
-		#endregion
+
+		#endregion ITaskbarList redeclaration
 
 		/// <summary>
 		/// Marks a window as full-screen.
@@ -772,7 +859,7 @@ internal interface ITaskbarList2 : ITaskbarList
 	]
 	internal interface IApplicationDestinations
 	{
-		// Set the App User Model ID for the application removing destinations from its list.  If an AppID is not provided 
+		// Set the App User Model ID for the application removing destinations from its list.  If an AppID is not provided
 		// via this method, the system will use a heuristically determined ID.  This method must be called before
 		// RemoveDestination or RemoveAllDestinations.
 		void SetAppID([In, MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
@@ -796,14 +883,14 @@ internal interface IApplicationDocumentLists
 	{
 		/// <summary>
 		/// Set the App User Model ID for the application retrieving this list.  If an AppID is not provided via this method,
-		/// the system will use a heuristically determined ID.  This method must be called before GetList. 
+		/// the system will use a heuristically determined ID.  This method must be called before GetList.
 		/// </summary>
 		/// <param name="pszAppID">App Id.</param>
 		void SetAppID([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
 
 		/// <summary>
-		/// Retrieve an IEnumObjects or IObjectArray for IShellItems and/or IShellLinks. 
-		/// Items may appear in both the frequent and recent lists.  
+		/// Retrieve an IEnumObjects or IObjectArray for IShellItems and/or IShellLinks.
+		/// Items may appear in both the frequent and recent lists.
 		/// </summary>
 		/// <param name="?"></param>
 		/// <returns></returns>
@@ -829,15 +916,20 @@ internal interface ICustomDestinationList
 		// Can't readily detect that case without just trying to append it.
 		[PreserveSig]
 		HRESULT AppendCategory([MarshalAs(UnmanagedType.LPWStr)] string pszCategory, IObjectArray poa);
+
 		void AppendKnownCategory(KDC category);
+
 		[PreserveSig]
 		HRESULT AddUserTasks(IObjectArray poa);
+
 		void CommitList();
 
 		// Retrieve IObjectCollection of IShellItems
 		[return: MarshalAs(UnmanagedType.Interface)]
 		object GetRemovedDestinations([In] ref Guid riid);
+
 		void DeleteList([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
+
 		void AbortList();
 	}
 
@@ -852,12 +944,13 @@ internal interface ICustomDestinationList
 	internal interface IObjectWithAppUserModelId
 	{
 		void SetAppID([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
+
 		[return: MarshalAs(UnmanagedType.LPWStr)]
 		string GetAppID();
 	};
 
 	/// <summary>
-	/// Provides access to the ProgID associated with an object 
+	/// Provides access to the ProgID associated with an object
 	/// </summary>
 	[
 		ComImport,
@@ -867,6 +960,7 @@ internal interface IObjectWithAppUserModelId
 	internal interface IObjectWithProgId
 	{
 		void SetProgID([MarshalAs(UnmanagedType.LPWStr)] string pszProgID);
+
 		[return: MarshalAs(UnmanagedType.LPWStr)]
 		string GetProgID();
 	};
@@ -881,16 +975,22 @@ internal interface ITaskbarList3 : ITaskbarList2
 		#region ITaskbarList2 redeclaration
 
 		#region ITaskbarList redeclaration
+
 		new void HrInit();
+
 		new void AddTab(IntPtr hwnd);
+
 		new void DeleteTab(IntPtr hwnd);
+
 		new void ActivateTab(IntPtr hwnd);
+
 		new void SetActiveAlt(IntPtr hwnd);
-		#endregion
+
+		#endregion ITaskbarList redeclaration
 
 		new void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
 
-		#endregion
+		#endregion ITaskbarList2 redeclaration
 
 		[PreserveSig]
 		HRESULT SetProgressValue(IntPtr hwnd, ulong ullCompleted, ulong ullTotal);
@@ -942,47 +1042,64 @@ internal interface ITaskbarList4 : ITaskbarList3
 		#region ITaskbarList2 redeclaration
 
 		#region ITaskbarList redeclaration
+
 		new void HrInit();
+
 		new void AddTab(IntPtr hwnd);
+
 		new void DeleteTab(IntPtr hwnd);
+
 		new void ActivateTab(IntPtr hwnd);
+
 		new void SetActiveAlt(IntPtr hwnd);
-		#endregion
+
+		#endregion ITaskbarList redeclaration
 
 		new void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
 
-		#endregion
+		#endregion ITaskbarList2 redeclaration
 
 		[PreserveSig]
 		new HRESULT SetProgressValue(IntPtr hwnd, ulong ullCompleted, ulong ullTotal);
+
 		[PreserveSig]
 		new HRESULT SetProgressState(IntPtr hwnd, TBPF tbpFlags);
+
 		[PreserveSig]
 		new HRESULT RegisterTab(IntPtr hwndTab, IntPtr hwndMDI);
+
 		[PreserveSig]
 		new HRESULT UnregisterTab(IntPtr hwndTab);
+
 		[PreserveSig]
 		new HRESULT SetTabOrder(IntPtr hwndTab, IntPtr hwndInsertBefore);
+
 		[PreserveSig]
 		new HRESULT SetTabActive(IntPtr hwndTab, IntPtr hwndMDI, uint dwReserved);
+
 		[PreserveSig]
 		new HRESULT ThumbBarAddButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
+
 		[PreserveSig]
 		new HRESULT ThumbBarUpdateButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
+
 		[PreserveSig]
 		new HRESULT ThumbBarSetImageList(IntPtr hwnd, [MarshalAs(UnmanagedType.IUnknown)] object himl);
+
 		[PreserveSig]
 		new HRESULT SetOverlayIcon(IntPtr hwnd, IntPtr hIcon, [MarshalAs(UnmanagedType.LPWStr)] string pszDescription);
+
 		[PreserveSig]
 		new HRESULT SetThumbnailTooltip(IntPtr hwnd, [MarshalAs(UnmanagedType.LPWStr)] string pszTip);
+
 		// Using RefRECT to making passing NULL possible.  Removes clipping from the HWND.
 		[PreserveSig]
 		new HRESULT SetThumbnailClip(IntPtr hwnd, RefRECT prcClip);
 
-		#endregion
+		#endregion ITaskbarList3 redeclaration
 
 		void SetTabProperties(IntPtr hwndTab, STPF stpFlags);
 	}
 
-	#endregion
-}
+	#endregion Interfaces
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/Standard/StreamHelper.cs b/source/Components/AvalonDock/Controls/Shell/Standard/StreamHelper.cs
index 28f58ff6..193cfac2 100644
--- a/source/Components/AvalonDock/Controls/Shell/Standard/StreamHelper.cs
+++ b/source/Components/AvalonDock/Controls/Shell/Standard/StreamHelper.cs
@@ -52,11 +52,12 @@ private void _Validate()
 		}
 
 		// Comments are taken from MSDN IStream documentation.
+
 		#region IStream Members
 
 		/// <summary>
 		/// Creates a new stream object with its own seek pointer that
-		/// references the same bytes as the original stream. 
+		/// references the same bytes as the original stream.
 		/// </summary>
 		/// <param name="ppstm">
 		/// When this method returns, contains the new stream object. This parameter is passed uninitialized.
@@ -75,10 +76,10 @@ public void Clone(out IStream ppstm)
 
 		/// <summary>
 		/// Ensures that any changes made to a stream object that is open in transacted
-		/// mode are reflected in the parent storage. 
+		/// mode are reflected in the parent storage.
 		/// </summary>
 		/// <param name="grfCommitFlags">
-		/// A value that controls how the changes for the stream object are committed. 
+		/// A value that controls how the changes for the stream object are committed.
 		/// </param>
 		/// <remarks>
 		/// For more information, see the existing documentation for IStream::Commit in the MSDN library.
@@ -91,13 +92,13 @@ public void Commit(int grfCommitFlags)
 
 		/// <summary>
 		/// Copies a specified number of bytes from the current seek pointer in the
-		/// stream to the current seek pointer in another stream. 
+		/// stream to the current seek pointer in another stream.
 		/// </summary>
 		/// <param name="pstm">
-		/// A reference to the destination stream. 
+		/// A reference to the destination stream.
 		/// </param>
 		/// <param name="cb">
-		/// The number of bytes to copy from the source stream. 
+		/// The number of bytes to copy from the source stream.
 		/// </param>
 		/// <param name="pcbRead">
 		/// On successful return, contains the actual number of bytes read from the source.
@@ -134,10 +135,10 @@ public void CopyTo(IStream pstm, long cb, IntPtr pcbRead, IntPtr pcbWritten)
 		}
 
 		/// <summary>
-		/// Restricts access to a specified range of bytes in the stream. 
+		/// Restricts access to a specified range of bytes in the stream.
 		/// </summary>
 		/// <param name="libOffset">
-		/// The byte offset for the beginning of the range. 
+		/// The byte offset for the beginning of the range.
 		/// </param>
 		/// <param name="cb">
 		/// The length of the range, in bytes, to restrict.
@@ -153,13 +154,13 @@ public void CopyTo(IStream pstm, long cb, IntPtr pcbRead, IntPtr pcbWritten)
 		public void LockRegion(long libOffset, long cb, int dwLockType) => HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
 
 		/// <summary>
-		/// Reads a specified number of bytes from the stream object into memory starting at the current seek pointer. 
+		/// Reads a specified number of bytes from the stream object into memory starting at the current seek pointer.
 		/// </summary>
 		/// <param name="pv">
 		/// When this method returns, contains the data read from the stream. This parameter is passed uninitialized.
 		/// </param>
 		/// <param name="cb">
-		/// The number of bytes to read from the stream object. 
+		/// The number of bytes to read from the stream object.
 		/// </param>
 		/// <param name="pcbRead">
 		/// A pointer to a ULONG variable that receives the actual number of bytes read from the stream object.
@@ -175,7 +176,6 @@ public void Read(byte[] pv, int cb, IntPtr pcbRead)
 			if (pcbRead != IntPtr.Zero) Marshal.WriteInt32(pcbRead, cbRead);
 		}
 
-
 		/// <summary>
 		/// Discards all changes that have been made to a transacted stream since the last Commit call.
 		/// </summary>
@@ -193,7 +193,7 @@ public void Read(byte[] pv, int cb, IntPtr pcbRead)
 		/// The displacement to add to dwOrigin.
 		/// </param>
 		/// <param name="dwOrigin">
-		/// The origin of the seek. The origin can be the beginning of the file, the current seek pointer, or the end of the file. 
+		/// The origin of the seek. The origin can be the beginning of the file, the current seek pointer, or the end of the file.
 		/// </param>
 		/// <param name="plibNewPosition">
 		/// On successful return, contains the offset of the seek pointer from the beginning of the stream.
@@ -212,10 +212,10 @@ public void Seek(long dlibMove, int dwOrigin, IntPtr plibNewPosition)
 		}
 
 		/// <summary>
-		/// Changes the size of the stream object. 
+		/// Changes the size of the stream object.
 		/// </summary>
 		/// <param name="libNewSize">
-		/// The new size of the stream as a number of bytes. 
+		/// The new size of the stream as a number of bytes.
 		/// </param>
 		/// <remarks>
 		/// For more information, see the existing documentation for IStream::SetSize in the MSDN library.
@@ -227,14 +227,14 @@ public void SetSize(long libNewSize)
 		}
 
 		/// <summary>
-		/// Retrieves the STATSTG structure for this stream. 
+		/// Retrieves the STATSTG structure for this stream.
 		/// </summary>
 		/// <param name="pstatstg">
 		/// When this method returns, contains a STATSTG structure that describes this stream object.
 		/// This parameter is passed uninitialized.
 		/// </param>
 		/// <param name="grfStatFlag">
-		/// Members in the STATSTG structure that this method does not return, thus saving some memory allocation operations. 
+		/// Members in the STATSTG structure that this method does not return, thus saving some memory allocation operations.
 		/// </param>
 		public void Stat(out STATSTG pstatstg, int grfStatFlag)
 		{
@@ -272,10 +272,10 @@ public void Stat(out STATSTG pstatstg, int grfStatFlag)
 		/// The buffer to write this stream to.
 		/// </param>
 		/// <param name="cb">
-		/// The number of bytes to write to the stream. 
+		/// The number of bytes to write to the stream.
 		/// </param>
 		/// <param name="pcbWritten">
-		/// On successful return, contains the actual number of bytes written to the stream object. 
+		/// On successful return, contains the actual number of bytes written to the stream object.
 		/// If the caller sets this pointer to null, this method does not provide the actual number
 		/// of bytes written.
 		/// </param>
@@ -294,6 +294,6 @@ public void Write(byte[] pv, int cb, IntPtr pcbWritten)
 		/// <inheritdoc />
 		public void Dispose() => _source = null;
 
-		#endregion
+		#endregion IDisposable Members
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/Standard/Utilities.cs b/source/Components/AvalonDock/Controls/Shell/Standard/Utilities.cs
index b4d1d727..4b5592fe 100644
--- a/source/Components/AvalonDock/Controls/Shell/Standard/Utilities.cs
+++ b/source/Components/AvalonDock/Controls/Shell/Standard/Utilities.cs
@@ -69,7 +69,6 @@ private static bool _MemCmp(IntPtr left, IntPtr right, long cb)
 		/// <returns>A Color representation of the parameter.</returns>
 		public static Color ColorFromArgbDword(uint color) => Color.FromArgb((byte)((color & 0xFF000000) >> 24), (byte)((color & 0x00FF0000) >> 16), (byte)((color & 0x0000FF00) >> 8), (byte)((color & 0x000000FF) >> 0));
 
-
 		[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
 		public static int GET_X_LPARAM(IntPtr lParam) => LOWORD(lParam.ToInt32());
 
@@ -311,6 +310,7 @@ private static BitmapFrame _GetBestMatch(IList<BitmapFrame> frames, int bitDepth
 
 		// This can be cached.  It's not going to change under reasonable circumstances.
 		private static int s_bitDepth; // = 0;
+
 		private static int _GetBitDepth()
 		{
 			if (s_bitDepth != 0) return s_bitDepth;
@@ -358,7 +358,6 @@ public static void SafeDestroyWindow(ref IntPtr hwnd)
 			if (NativeMethods.IsWindow(p)) NativeMethods.DestroyWindow(p);
 		}
 
-
 		[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
 		public static void SafeDispose<T>(ref T disposable) where T : IDisposable
 		{
@@ -466,7 +465,7 @@ public static void CopyStream(Stream destination, Stream source)
 			if (source.CanSeek)
 			{
 				source.Position = 0;
-				// Consider that this could throw because 
+				// Consider that this could throw because
 				// the source stream doesn't know it's size...
 				destination.SetLength(source.Length);
 			}
@@ -693,6 +692,7 @@ private static bool _UrlEncodeIsSafe(byte b)
 				case '(':
 				case ')':
 					return true;
+
 				default: return false;
 			}
 		}
@@ -757,6 +757,6 @@ public static bool IsCornerRadiusValid(CornerRadius cornerRadius)
 
 		public static bool IsDoubleFiniteAndNonNegative(double d) => !double.IsNaN(d) && !double.IsInfinity(d) && !(d < 0);
 
-		#endregion
+		#endregion Extension Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/Standard/Verify.cs b/source/Components/AvalonDock/Controls/Shell/Standard/Verify.cs
index 1b625490..55bafcaa 100644
--- a/source/Components/AvalonDock/Controls/Shell/Standard/Verify.cs
+++ b/source/Components/AvalonDock/Controls/Shell/Standard/Verify.cs
@@ -240,4 +240,4 @@ internal static void ImplementsInterface(object parameter, Type interfaceType, s
 				throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "The parameter must implement interface {0}.", interfaceType.ToString()), parameterName);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/SystemCommands.cs b/source/Components/AvalonDock/Controls/Shell/SystemCommands.cs
index 8602489c..3d2b92bd 100644
--- a/source/Components/AvalonDock/Controls/Shell/SystemCommands.cs
+++ b/source/Components/AvalonDock/Controls/Shell/SystemCommands.cs
@@ -9,11 +9,11 @@ This program is provided to you under the terms of the Microsoft Public
 
 namespace Microsoft.Windows.Shell
 {
+	using Standard;
 	using System;
 	using System.Windows;
 	using System.Windows.Input;
 	using System.Windows.Interop;
-	using Standard;
 
 	public static class SystemCommands
 	{
@@ -85,4 +85,4 @@ internal static void ShowSystemMenuPhysicalCoordinates(Window window, Point phys
 			if (cmd != 0) NativeMethods.PostMessage(hWnd, WM.SYSCOMMAND, new IntPtr(cmd), IntPtr.Zero);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/SystemParameters2.cs b/source/Components/AvalonDock/Controls/Shell/SystemParameters2.cs
index 91357fc0..071379f2 100644
--- a/source/Components/AvalonDock/Controls/Shell/SystemParameters2.cs
+++ b/source/Components/AvalonDock/Controls/Shell/SystemParameters2.cs
@@ -13,6 +13,7 @@ Copyright Microsoft Corporation. All Rights Reserved.
 
 namespace Microsoft.Windows.Shell
 {
+	using Standard;
 	using System;
 	using System.Collections.Generic;
 	using System.ComponentModel;
@@ -20,7 +21,6 @@ namespace Microsoft.Windows.Shell
 	using System.Runtime.InteropServices;
 	using System.Windows;
 	using System.Windows.Media;
-	using Standard;
 
 	[SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable")]
 	public class SystemParameters2 : INotifyPropertyChanged
@@ -218,7 +218,7 @@ private void _InitializeThemeInfo()
 				return;
 			}
 
-            NativeMethods.GetCurrentThemeName(out var name, out var color, out _);
+			NativeMethods.GetCurrentThemeName(out var name, out var color, out _);
 
 			// Consider whether this is the most useful way to expose this...
 			UxThemeName = System.IO.Path.GetFileNameWithoutExtension(name);
@@ -237,22 +237,23 @@ private void _InitializeWindowCornerRadius()
 			// There aren't any known variations based on theme color.
 			Assert.IsNeitherNullNorEmpty(UxThemeName);
 
-            // These radii are approximate.  The way WPF does rounding is different than how
-            //     rounded-rectangle HRGNs are created, which is also different than the actual
-            //     round corners on themed Windows.  For now we're not exposing anything to
-            //     mitigate the differences.
-            CornerRadius cornerRadius;
-
-            // This list is known to be incomplete and very much not future-proof.
-            // On XP there are at least a couple of shipped themes that this won't catch,
-            // "Zune" and "Royale", but WPF doesn't know about these either.
-            // If a new theme was to replace Aero, then this will fall back on "classic" behaviors.
-            // This isn't ideal, but it's not the end of the world.  WPF will generally have problems anyways.
-            switch (UxThemeName.ToUpperInvariant())
+			// These radii are approximate.  The way WPF does rounding is different than how
+			//     rounded-rectangle HRGNs are created, which is also different than the actual
+			//     round corners on themed Windows.  For now we're not exposing anything to
+			//     mitigate the differences.
+			CornerRadius cornerRadius;
+
+			// This list is known to be incomplete and very much not future-proof.
+			// On XP there are at least a couple of shipped themes that this won't catch,
+			// "Zune" and "Royale", but WPF doesn't know about these either.
+			// If a new theme was to replace Aero, then this will fall back on "classic" behaviors.
+			// This isn't ideal, but it's not the end of the world.  WPF will generally have problems anyways.
+			switch (UxThemeName.ToUpperInvariant())
 			{
 				case "LUNA":
 					cornerRadius = new CornerRadius(6, 6, 0, 0);
 					break;
+
 				case "AERO":
 					// Aero has two cases.  One with glass and one without...
 					if (NativeMethods.DwmIsCompositionEnabled())
@@ -264,6 +265,7 @@ private void _InitializeWindowCornerRadius()
 						cornerRadius = new CornerRadius(6, 6, 0, 0);
 					}
 					break;
+
 				case "CLASSIC":
 				case "ZUNE":
 				case "ROYALE":
@@ -496,4 +498,4 @@ private void _NotifyPropertyChanged(string propertyName)
 
 		#endregion INotifyPropertyChanged Members
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/WindowChrome.cs b/source/Components/AvalonDock/Controls/Shell/WindowChrome.cs
index 4e1e1406..8ffe0a59 100644
--- a/source/Components/AvalonDock/Controls/Shell/WindowChrome.cs
+++ b/source/Components/AvalonDock/Controls/Shell/WindowChrome.cs
@@ -13,12 +13,12 @@ Copyright Microsoft Corporation. All Rights Reserved.
 
 namespace Microsoft.Windows.Shell
 {
+	using Standard;
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.CodeAnalysis;
 	using System.Windows;
 	using System.Windows.Data;
-	using Standard;
 
 	public class WindowChrome : Freezable
 	{
@@ -153,7 +153,7 @@ public Thickness ResizeBorderThickness
 
 		private static object _CoerceGlassFrameThickness(Thickness thickness)
 		{
-			// If it's explicitly set, but set to a thickness with at least one negative side then 
+			// If it's explicitly set, but set to a thickness with at least one negative side then
 			// coerce the value to the stock GlassFrameCompleteThickness.
 			return !Utility.IsThicknessNonNegative(thickness) ? GlassFrameCompleteThickness : thickness;
 		}
@@ -194,4 +194,4 @@ protected override Freezable CreateInstanceCore()
 
 		private void _OnPropertyChangedThatRequiresRepaint() => PropertyChangedThatRequiresRepaint?.Invoke(this, EventArgs.Empty);
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/Shell/WindowChromeWorker.cs b/source/Components/AvalonDock/Controls/Shell/WindowChromeWorker.cs
index d7b8fa8a..3ae22dda 100644
--- a/source/Components/AvalonDock/Controls/Shell/WindowChromeWorker.cs
+++ b/source/Components/AvalonDock/Controls/Shell/WindowChromeWorker.cs
@@ -13,18 +13,17 @@ Copyright Microsoft Corporation. All Rights Reserved.
 
 namespace Microsoft.Windows.Shell
 {
+	using Standard;
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.CodeAnalysis;
 	using System.Runtime.InteropServices;
 	using System.Windows;
+	using System.Windows.Controls.Primitives;
 	using System.Windows.Interop;
 	using System.Windows.Media;
 	using System.Windows.Threading;
-	using Standard;
-
 	using HANDLE_MESSAGE = System.Collections.Generic.KeyValuePair<Standard.WM, Standard.MessageHandler>;
-	using System.Windows.Controls.Primitives;
 
 	internal class WindowChromeWorker : DependencyObject
 	{
@@ -39,13 +38,16 @@ internal class WindowChromeWorker : DependencyObject
 
 		/// <summary>The Window that's chrome is being modified.</summary>
 		private Window _window;
+
 		/// <summary>Underlying HWND for the _window.</summary>
 		private IntPtr _hwnd;
+
 		private HwndSource _hwndSource = null;
 		private bool _isHooked = false;
 
 		// These fields are for tracking workarounds for WPF 3.5SP1 behaviors.
 		private bool _isFixedUp = false;
+
 		private bool _isUserResizing = false;
 		private bool _hasUserMovedWindow = false;
 		private Point _windowPosAtStartOfUserMove = default;
@@ -59,6 +61,7 @@ internal class WindowChromeWorker : DependencyObject
 		// Keep track of this so we can detect when we need to apply changes.  Tracking these separately
 		// as I've seen using just one cause things to get enough out of sync that occasionally the caption will redraw.
 		private WindowState _lastRoundingState;
+
 		private WindowState _lastMenuState;
 		private bool _isGlassEnabled;
 
@@ -252,7 +255,7 @@ private void _FixupFrameworkIssues()
 			   rcLogicalClient.Right - rcLogicalWindow.Right,
 			   rcLogicalClient.Bottom - rcLogicalWindow.Bottom);
 
-			if (rootElement != null) 
+			if (rootElement != null)
 				rootElement.Margin = new Thickness(0, 0, -(nonClientThickness.Left + nonClientThickness.Right), -(nonClientThickness.Top + nonClientThickness.Bottom));
 
 			// The negative thickness on the margin doesn't properly get applied in RTL layouts.
@@ -314,7 +317,7 @@ private void _FixupWindows7Issues()
 			// NativeMethods.DwmGetCompositionTimingInfo swallows E_PENDING.
 			// If the call wasn't successful, try again later.
 			if (!success)
-				Dispatcher.BeginInvoke(DispatcherPriority.Loaded, (_Action) _FixupWindows7Issues);
+				Dispatcher.BeginInvoke(DispatcherPriority.Loaded, (_Action)_FixupWindows7Issues);
 			else
 				// Reset this.  We will want to force this again if DWM composition changes.
 				_blackGlassFixupAttemptCount = 0;
@@ -545,7 +548,7 @@ private IntPtr _HandleEnterSizeMove(WM uMsg, IntPtr wParam, IntPtr lParam, out b
 			Assert.Implies(_window.WindowState == WindowState.Maximized, Utility.IsOSWindows7OrNewer);
 			if (_window.WindowState != WindowState.Maximized)
 			{
-				// Check for the docked window case.  The window can still be restored when it's in this position so 
+				// Check for the docked window case.  The window can still be restored when it's in this position so
 				// try to account for that and not update the start position.
 				if (!_IsWindowDocked)
 				{
@@ -612,6 +615,7 @@ private WindowState _GetHwndState()
 			{
 				case SW.SHOWMINIMIZED:
 					return WindowState.Minimized;
+
 				case SW.SHOWMAXIMIZED:
 					return WindowState.Maximized;
 			}
@@ -667,6 +671,7 @@ private void _UpdateSystemMenu(WindowState? assumeState)
 						NativeMethods.EnableMenuItem(hMenu, SC.MINIMIZE, canMinimize ? mfEnabled : mfDisabled);
 						NativeMethods.EnableMenuItem(hMenu, SC.MAXIMIZE, mfDisabled);
 						break;
+
 					case WindowState.Minimized:
 						NativeMethods.EnableMenuItem(hMenu, SC.RESTORE, mfEnabled);
 						NativeMethods.EnableMenuItem(hMenu, SC.MOVE, mfDisabled);
@@ -674,6 +679,7 @@ private void _UpdateSystemMenu(WindowState? assumeState)
 						NativeMethods.EnableMenuItem(hMenu, SC.MINIMIZE, mfDisabled);
 						NativeMethods.EnableMenuItem(hMenu, SC.MAXIMIZE, canMaximize ? mfEnabled : mfDisabled);
 						break;
+
 					default:
 						NativeMethods.EnableMenuItem(hMenu, SC.RESTORE, mfDisabled);
 						NativeMethods.EnableMenuItem(hMenu, SC.MOVE, mfEnabled);
@@ -761,8 +767,8 @@ private void _SetRoundingRegion(WINDOWPOS? wp)
 				Size windowSize;
 
 				// Use the size if it's specified.
-				if (null != wp && !Utility.IsFlagSet(wp.Value.flags, (int) SWP.NOSIZE))
-					windowSize = new Size((double) wp.Value.cx, (double) wp.Value.cy);
+				if (null != wp && !Utility.IsFlagSet(wp.Value.flags, (int)SWP.NOSIZE))
+					windowSize = new Size((double)wp.Value.cx, (double)wp.Value.cy);
 				else if (null != wp && (_lastRoundingState == _window.WindowState))
 					return;
 				else
@@ -831,8 +837,8 @@ private static IntPtr _CreateRoundRectRgn(Rect region, double radius)
 		{
 			// Round outwards.
 			if (DoubleUtilities.AreClose(0, radius))
-				return NativeMethods.CreateRectRgn((int) Math.Floor(region.Left), (int) Math.Floor(region.Top), 
-													(int) Math.Ceiling(region.Right), (int) Math.Ceiling(region.Bottom));
+				return NativeMethods.CreateRectRgn((int)Math.Floor(region.Left), (int)Math.Floor(region.Top),
+													(int)Math.Ceiling(region.Right), (int)Math.Ceiling(region.Bottom));
 
 			// RoundedRect HRGNs require an additional pixel of padding on the bottom right to look correct.
 			return NativeMethods.CreateRoundRectRgn(
@@ -936,13 +942,13 @@ private HT _HitTestNca(Rect windowPosition, Point mousePosition)
 				onResizeBorder = (mousePosition.Y < (windowPosition.Top + _chromeInfo.ResizeBorderThickness.Top));
 				uRow = 0; // top (caption or resize border)
 			}
-			else if (mousePosition.Y < windowPosition.Bottom && mousePosition.Y >= windowPosition.Bottom - (int)_chromeInfo.ResizeBorderThickness.Bottom) 
+			else if (mousePosition.Y < windowPosition.Bottom && mousePosition.Y >= windowPosition.Bottom - (int)_chromeInfo.ResizeBorderThickness.Bottom)
 				uRow = 2; // bottom
 
 			// Determine if the point is at the left or right of the window.
-			if (mousePosition.X >= windowPosition.Left && mousePosition.X < windowPosition.Left + (int) _chromeInfo.ResizeBorderThickness.Left)
+			if (mousePosition.X >= windowPosition.Left && mousePosition.X < windowPosition.Left + (int)_chromeInfo.ResizeBorderThickness.Left)
 				uCol = 0; // left side
-			else if (mousePosition.X < windowPosition.Right && mousePosition.X >= windowPosition.Right - _chromeInfo.ResizeBorderThickness.Right) 
+			else if (mousePosition.X < windowPosition.Right && mousePosition.X >= windowPosition.Right - _chromeInfo.ResizeBorderThickness.Right)
 				uCol = 2; // right side
 
 			// If the cursor is in one of the top edges by the caption bar, but below the top resize border,
@@ -1014,4 +1020,4 @@ private void _RestoreHrgn()
 
 		#endregion Remove Custom Chrome Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/TabControlEx.cs b/source/Components/AvalonDock/Controls/TabControlEx.cs
index 2543d7f1..6803323a 100644
--- a/source/Components/AvalonDock/Controls/TabControlEx.cs
+++ b/source/Components/AvalonDock/Controls/TabControlEx.cs
@@ -11,18 +11,21 @@ namespace AvalonDock.Controls
 	/// This control added to mitigate issue with tab (document) switching speed
 	/// See this https://stackoverflow.com/questions/2080764/how-to-preserve-control-state-within-tab-items-in-a-tabcontrol
 	/// and this https://stackoverflow.com/questions/31030293/cefsharp-in-tabcontrol-not-working/37171847#37171847
-	/// 
+	///
 	/// by implmenting an option to enable virtualization for tabbed document containers.
 	/// </summary>
 	[TemplatePart(Name = "PART_ItemsHolder", Type = typeof(Panel))]
 	public class TabControlEx : TabControl
 	{
 		#region fields
+
 		private Panel ItemsHolderPanel = null;
 		private readonly bool _IsVirtualizing;
+
 		#endregion fields
 
 		#region constructors
+
 		/// <summary>
 		/// Class constructor from virtualization parameter.
 		/// </summary>
@@ -44,16 +47,20 @@ protected TabControlEx()
 			// This is necessary so that we get the initial databound selected item
 			ItemContainerGenerator.StatusChanged += ItemContainerGenerator_StatusChanged;
 		}
+
 		#endregion constructors
 
 		#region properties
+
 		/// <summary>
 		/// Gets whether the control and its inheriting classes are virtualizing their items or not.
 		/// </summary>
 		public bool IsVirtualiting => _IsVirtualizing;
+
 		#endregion properties
 
 		#region methods
+
 		/// <summary>
 		/// Get the ItemsHolder and generate any children
 		/// </summary>
@@ -89,7 +96,6 @@ public override void OnApplyTemplate()
 			UpdateSelectedItem();
 		}
 
-
 		/// <summary>
 		/// When the items change we remove any generated panel children and add any new ones as necessary
 		/// </summary>
@@ -255,6 +261,7 @@ private ContentPresenter FindChildContentPresenter(object data)
 
 			return null;
 		}
+
 		#endregion methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/TransformExtentions.cs b/source/Components/AvalonDock/Controls/TransformExtentions.cs
index 2683f455..4b576366 100644
--- a/source/Components/AvalonDock/Controls/TransformExtentions.cs
+++ b/source/Components/AvalonDock/Controls/TransformExtentions.cs
@@ -108,6 +108,5 @@ public static GeneralTransform TansformToAncestor(this FrameworkElement element)
 			var parentWindow = PresentationSource.FromVisual(element).RootVisual;
 			return element.TransformToAncestor(parentWindow);
 		}
-
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/WeakDictionary.cs b/source/Components/AvalonDock/Controls/WeakDictionary.cs
index 126deb65..83c6b6c3 100644
--- a/source/Components/AvalonDock/Controls/WeakDictionary.cs
+++ b/source/Components/AvalonDock/Controls/WeakDictionary.cs
@@ -21,8 +21,10 @@ namespace AvalonDock.Controls
 	internal class WeakDictionary<K, V> where K : class
 	{
 		#region fields
+
 		private List<WeakReference> _keys = new List<WeakReference>();
 		private List<V> _values = new List<V>();
+
 		#endregion fields
 
 		#region Public Methods
@@ -121,4 +123,4 @@ private void CollectGarbage()
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/WindowActivateEventArgs.cs b/source/Components/AvalonDock/Controls/WindowActivateEventArgs.cs
index 32b344bb..37d6615d 100644
--- a/source/Components/AvalonDock/Controls/WindowActivateEventArgs.cs
+++ b/source/Components/AvalonDock/Controls/WindowActivateEventArgs.cs
@@ -20,4 +20,4 @@ public WindowActivateEventArgs(IntPtr hwndActivating)
 
 		public IntPtr HwndActivating { get; private set; }
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Controls/WindowHookHandler.cs b/source/Components/AvalonDock/Controls/WindowHookHandler.cs
index d9c1b342..2ee11bdc 100644
--- a/source/Components/AvalonDock/Controls/WindowHookHandler.cs
+++ b/source/Components/AvalonDock/Controls/WindowHookHandler.cs
@@ -35,9 +35,11 @@ public FocusChangeEventArgs(IntPtr gotFocusWinHandle, IntPtr lostFocusWinHandle)
 	internal class WindowHookHandler
 	{
 		#region fields
+
 		private IntPtr _windowHook;
 		private Win32Helper.HookProc _hookProc;
 		private ReentrantFlag _insideActivateEvent = new ReentrantFlag();
+
 		#endregion fields
 
 		#region Constructors
@@ -51,6 +53,7 @@ public WindowHookHandler()
 		#region Events
 
 		public event EventHandler<FocusChangeEventArgs> FocusChanged;
+
 		//public event EventHandler<WindowActivateEventArgs> Activate;
 
 		#endregion Events
@@ -91,10 +94,9 @@ public int HookProc(int code, IntPtr wParam, IntPtr lParam)
 				}
 			}
 
-
 			return Win32Helper.CallNextHookEx(_windowHook, code, wParam, lParam);
 		}
 
 		#endregion Public Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs b/source/Components/AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs
index c5bab8ae..521fbbe2 100644
--- a/source/Components/AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs
+++ b/source/Components/AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs
@@ -7,65 +7,65 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Windows.Data;
 using System.Windows.Markup;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Converters
 {
-    /// <summary>
-    /// Converts a <see cref="LayoutContent"/> into an  <see cref="LayoutItem.ActivateCommand"/>
-    /// and ensures that other essential properties (Root, Root.Manager) are available.
-    ///
-    /// Returns null or Binding.DoNothing otherwise.
-    /// </summary>
-    public class ActivateCommandLayoutItemFromLayoutModelConverter : MarkupExtension, IValueConverter
-    {
-        /// <summary>
-        /// Converts a <see cref="LayoutContent"/> into an  <see cref="LayoutItem.ActivateCommand"/>
-        /// and ensures that other essential properties (Root, Root.Manager) are available.
-        /// </summary>
-        /// <param name="value">The value produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            //when this converter is called layout could be constructing so many properties here are potentially not valid
-            if (!(value is LayoutContent layoutModel))
-                return null;
+	/// <summary>
+	/// Converts a <see cref="LayoutContent"/> into an  <see cref="LayoutItem.ActivateCommand"/>
+	/// and ensures that other essential properties (Root, Root.Manager) are available.
+	///
+	/// Returns null or Binding.DoNothing otherwise.
+	/// </summary>
+	public class ActivateCommandLayoutItemFromLayoutModelConverter : MarkupExtension, IValueConverter
+	{
+		/// <summary>
+		/// Converts a <see cref="LayoutContent"/> into an  <see cref="LayoutItem.ActivateCommand"/>
+		/// and ensures that other essential properties (Root, Root.Manager) are available.
+		/// </summary>
+		/// <param name="value">The value produced by the binding source.</param>
+		/// <param name="targetType">The type of the binding target property.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			//when this converter is called layout could be constructing so many properties here are potentially not valid
+			if (!(value is LayoutContent layoutModel))
+				return null;
 
-            if (layoutModel.Root == null)
-                return null;
+			if (layoutModel.Root == null)
+				return null;
 
-            if (layoutModel.Root.Manager == null)
-                return null;
+			if (layoutModel.Root.Manager == null)
+				return null;
 
-            var layoutItemModel = layoutModel.Root.Manager.GetLayoutItemFromModel(layoutModel);
-            if (layoutItemModel == null)
-                return Binding.DoNothing;
+			var layoutItemModel = layoutModel.Root.Manager.GetLayoutItemFromModel(layoutModel);
+			if (layoutItemModel == null)
+				return Binding.DoNothing;
 
-            return layoutItemModel.ActivateCommand;
-        }
+			return layoutItemModel.ActivateCommand;
+		}
 
-        /// <summary>
-        /// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="targetType"></param>
-        /// <param name="parameter"></param>
-        /// <param name="culture"></param>
-        /// <returns><see cref="System.NotImplementedException"/></returns>
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary>
+		/// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="targetType"></param>
+		/// <param name="parameter"></param>
+		/// <param name="culture"></param>
+		/// <returns><see cref="System.NotImplementedException"/></returns>
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
 
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return ConverterCreater.Get<ActivateCommandLayoutItemFromLayoutModelConverter>();
-        }
-    }
-}
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return ConverterCreater.Get<ActivateCommandLayoutItemFromLayoutModelConverter>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/AnchorSideToAngleConverter.cs b/source/Components/AvalonDock/Converters/AnchorSideToAngleConverter.cs
index 909aa52a..a957a59d 100644
--- a/source/Components/AvalonDock/Converters/AnchorSideToAngleConverter.cs
+++ b/source/Components/AvalonDock/Converters/AnchorSideToAngleConverter.cs
@@ -7,58 +7,58 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Windows.Data;
 using System.Windows.Markup;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Converters
 {
-    /// <summary>
-    /// Converts an <see cref="AnchorSide"/> value into a floating point value that
-    /// indicates whether the content should be rotated by 90.0 degrees or not.
-    /// 
-    /// Returns Binding.DoNothing if not rotation is required.
-    /// </summary>
-    [ValueConversion(typeof(AnchorSide), typeof(double))]
-    public class AnchorSideToAngleConverter : MarkupExtension, IValueConverter
-    {
-        /// <summary>
-        /// Converts an <see cref="AnchorSide"/> value into a floating point value that
-        /// indicates whether the content should be rotated by 90.0 degrees or not.
-        /// 
-        /// Returns Binding.DoNothing if not rotation is required.
-        /// </summary>
-        /// <param name="value">The value produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value.</returns>
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            AnchorSide side = (AnchorSide)value;
-            if (side == AnchorSide.Left || side == AnchorSide.Right)
-                return 90.0;
+	/// <summary>
+	/// Converts an <see cref="AnchorSide"/> value into a floating point value that
+	/// indicates whether the content should be rotated by 90.0 degrees or not.
+	///
+	/// Returns Binding.DoNothing if not rotation is required.
+	/// </summary>
+	[ValueConversion(typeof(AnchorSide), typeof(double))]
+	public class AnchorSideToAngleConverter : MarkupExtension, IValueConverter
+	{
+		/// <summary>
+		/// Converts an <see cref="AnchorSide"/> value into a floating point value that
+		/// indicates whether the content should be rotated by 90.0 degrees or not.
+		///
+		/// Returns Binding.DoNothing if not rotation is required.
+		/// </summary>
+		/// <param name="value">The value produced by the binding source.</param>
+		/// <param name="targetType">The type of the binding target property.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>A converted value.</returns>
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			AnchorSide side = (AnchorSide)value;
+			if (side == AnchorSide.Left || side == AnchorSide.Right)
+				return 90.0;
 
-            return Binding.DoNothing;
-        }
+			return Binding.DoNothing;
+		}
 
-        /// <summary>
-        /// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="targetType"></param>
-        /// <param name="parameter"></param>
-        /// <param name="culture"></param>
-        /// <returns><see cref="System.NotImplementedException"/></returns>
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary>
+		/// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="targetType"></param>
+		/// <param name="parameter"></param>
+		/// <param name="culture"></param>
+		/// <returns><see cref="System.NotImplementedException"/></returns>
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
 
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return ConverterCreater.Get<AnchorSideToAngleConverter>();
-        }
-    }
-}
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return ConverterCreater.Get<AnchorSideToAngleConverter>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/AnchorSideToOrientationConverter.cs b/source/Components/AvalonDock/Converters/AnchorSideToOrientationConverter.cs
index 4e217012..0a0dbf60 100644
--- a/source/Components/AvalonDock/Converters/AnchorSideToOrientationConverter.cs
+++ b/source/Components/AvalonDock/Converters/AnchorSideToOrientationConverter.cs
@@ -7,17 +7,17 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
-using System.Windows.Data;
 using System.Windows.Controls;
-using AvalonDock.Layout;
+using System.Windows.Data;
 using System.Windows.Markup;
 
 namespace AvalonDock.Converters
 {
 	/// <summary>
 	/// Converts an <see cref="AnchorSide"/> value into a WPF <see cref="Orientation"/> value.
-	/// 
+	///
 	/// Returns <see cref="Orientation.Vertical"/> for <see cref="AnchorSide.Left"/> or <see cref="AnchorSide.Right"/>,
 	/// othrwise <see cref="Orientation.Horizontal"/> is returned.
 	/// </summary>
@@ -26,7 +26,7 @@ public class AnchorSideToOrientationConverter : MarkupExtension, IValueConverter
 	{
 		/// <summary>
 		/// Converts an <see cref="AnchorSide"/> value into a WPF <see cref="Orientation"/> value.
-		/// 
+		///
 		/// Returns <see cref="Orientation.Vertical"/> for <see cref="AnchorSide.Left"/> or <see cref="AnchorSide.Right"/>,
 		/// othrwise <see cref="Orientation.Horizontal"/> is returned.
 		/// </summary>
@@ -57,9 +57,9 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste
 			throw new NotImplementedException();
 		}
 
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
 			return ConverterCreater.Get<AnchorSideToOrientationConverter>();
 		}
-    }
-}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs b/source/Components/AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs
index 2a97a6ee..41341221 100644
--- a/source/Components/AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs
+++ b/source/Components/AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs
@@ -16,64 +16,64 @@ This program is provided to you under the terms of the Microsoft Public
 
 namespace AvalonDock.Converters
 {
-    /// <summary>
-    /// Converts a binding of 2 values:
-    /// 1) <see cref="Visibility"/> and
-    /// 2) bool
-    /// into a <see cref="Visibility"/> value.
-    ///
-    /// The actual <see cref="Visibility"/> value returned is 1) if 2) is true,
-    /// <see cref="Visibility.Collapsed"/>  is returned otherwise. 
-    /// </summary>
-    public class AnchorableContextMenuHideVisibilityConverter : MarkupExtension, IMultiValueConverter
-    {
-        /// <summary>
-        /// Converts a binding of 2 values:
-        /// 1) <see cref="Visibility"/> and
-        /// 2) bool
-        /// into a <see cref="Visibility"/> value.
-        ///
-        /// The actual <see cref="Visibility"/> value returned is 1) if 2) is true,
-        /// <see cref="Visibility.Collapsed"/>  is returned otherwise. 
-        /// </summary>
-        /// <param name="values">The value produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            if ((values.Count() == 2)
-              && (values[0] != DependencyProperty.UnsetValue)
-              && (values[1] != DependencyProperty.UnsetValue)
-              && (values[1] is bool boolean))
-            {
-                var canClose = boolean;
+	/// <summary>
+	/// Converts a binding of 2 values:
+	/// 1) <see cref="Visibility"/> and
+	/// 2) bool
+	/// into a <see cref="Visibility"/> value.
+	///
+	/// The actual <see cref="Visibility"/> value returned is 1) if 2) is true,
+	/// <see cref="Visibility.Collapsed"/>  is returned otherwise.
+	/// </summary>
+	public class AnchorableContextMenuHideVisibilityConverter : MarkupExtension, IMultiValueConverter
+	{
+		/// <summary>
+		/// Converts a binding of 2 values:
+		/// 1) <see cref="Visibility"/> and
+		/// 2) bool
+		/// into a <see cref="Visibility"/> value.
+		///
+		/// The actual <see cref="Visibility"/> value returned is 1) if 2) is true,
+		/// <see cref="Visibility.Collapsed"/>  is returned otherwise.
+		/// </summary>
+		/// <param name="values">The value produced by the binding source.</param>
+		/// <param name="targetType">The type of the binding target property.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
+		public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+		{
+			if ((values.Count() == 2)
+			  && (values[0] != DependencyProperty.UnsetValue)
+			  && (values[1] != DependencyProperty.UnsetValue)
+			  && (values[1] is bool boolean))
+			{
+				var canClose = boolean;
 
-                return canClose ? Visibility.Collapsed : values[0];
-            }
-            else
-            {
-                return values[0];
-            }
-        }
+				return canClose ? Visibility.Collapsed : values[0];
+			}
+			else
+			{
+				return values[0];
+			}
+		}
 
-        /// <summary>
-        /// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="targetTypes"></param>
-        /// <param name="parameter"></param>
-        /// <param name="culture"></param>
-        /// <returns><see cref="System.NotImplementedException"/></returns>
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary>
+		/// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="targetTypes"></param>
+		/// <param name="parameter"></param>
+		/// <param name="culture"></param>
+		/// <returns><see cref="System.NotImplementedException"/></returns>
+		public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
 
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return ConverterCreater.Get<AnchorableContextMenuHideVisibilityConverter>();
-        }
-    }
-}
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return ConverterCreater.Get<AnchorableContextMenuHideVisibilityConverter>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs b/source/Components/AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs
index 27cd3b0e..dc9ade17 100644
--- a/source/Components/AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs
+++ b/source/Components/AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs
@@ -7,67 +7,67 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Controls;
+using AvalonDock.Layout;
 using System;
 using System.Windows.Data;
-using AvalonDock.Layout;
-using AvalonDock.Controls;
 using System.Windows.Markup;
 
 namespace AvalonDock.Converters
 {
-    /// <summary>
-    /// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutAnchorableItem.AutoHideCommand"/>
-    /// and ensures that other essential properties (Root, Root.Manager) are available.
-    ///
-    /// Returns null or Binding.DoNothing otherwise.
-    /// </summary>
-    public class AutoHideCommandLayoutItemFromLayoutModelConverter : MarkupExtension, IValueConverter
-    {
-        /// <summary>
-        /// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutAnchorableItem.AutoHideCommand"/>
-        /// and ensures that other essential properties (Root, Root.Manager) are available.
-        ///
-        /// Returns null or Binding.DoNothing otherwise.
-        /// </summary>
-        /// <param name="values">The value produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value.</returns>
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            //when this converter is called layout could be constructing so many properties here are potentially not valid
-            if (value as LayoutContent == null)
-                return null;
+	/// <summary>
+	/// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutAnchorableItem.AutoHideCommand"/>
+	/// and ensures that other essential properties (Root, Root.Manager) are available.
+	///
+	/// Returns null or Binding.DoNothing otherwise.
+	/// </summary>
+	public class AutoHideCommandLayoutItemFromLayoutModelConverter : MarkupExtension, IValueConverter
+	{
+		/// <summary>
+		/// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutAnchorableItem.AutoHideCommand"/>
+		/// and ensures that other essential properties (Root, Root.Manager) are available.
+		///
+		/// Returns null or Binding.DoNothing otherwise.
+		/// </summary>
+		/// <param name="values">The value produced by the binding source.</param>
+		/// <param name="targetType">The type of the binding target property.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>A converted value.</returns>
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			//when this converter is called layout could be constructing so many properties here are potentially not valid
+			if (value as LayoutContent == null)
+				return null;
 
-            if ((value as LayoutContent).Root == null)
-                return null;
+			if ((value as LayoutContent).Root == null)
+				return null;
 
-            if ((value as LayoutContent).Root.Manager == null)
-                return null;
+			if ((value as LayoutContent).Root.Manager == null)
+				return null;
 
-            if (!((value as LayoutContent).Root.Manager.GetLayoutItemFromModel(value as LayoutContent) is LayoutAnchorableItem layoutItemModel))
-                return Binding.DoNothing;
+			if (!((value as LayoutContent).Root.Manager.GetLayoutItemFromModel(value as LayoutContent) is LayoutAnchorableItem layoutItemModel))
+				return Binding.DoNothing;
 
-            return layoutItemModel.AutoHideCommand;
-        }
+			return layoutItemModel.AutoHideCommand;
+		}
 
-        /// <summary>
-        /// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="targetType"></param>
-        /// <param name="parameter"></param>
-        /// <param name="culture"></param>
-        /// <returns><see cref="System.NotImplementedException"/></returns>
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary>
+		/// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="targetType"></param>
+		/// <param name="parameter"></param>
+		/// <param name="culture"></param>
+		/// <returns><see cref="System.NotImplementedException"/></returns>
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
 
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return ConverterCreater.Get<AutoHideCommandLayoutItemFromLayoutModelConverter>();
-        }
-    }
-}
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return ConverterCreater.Get<AutoHideCommandLayoutItemFromLayoutModelConverter>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/BoolToVisibilityConverter.cs b/source/Components/AvalonDock/Converters/BoolToVisibilityConverter.cs
index 1f8ba742..db8a8c2f 100644
--- a/source/Components/AvalonDock/Converters/BoolToVisibilityConverter.cs
+++ b/source/Components/AvalonDock/Converters/BoolToVisibilityConverter.cs
@@ -8,68 +8,71 @@ This program is provided to you under the terms of the Microsoft Public
  ************************************************************************/
 
 using System;
-using System.Windows.Data;
 using System.Windows;
+using System.Windows.Data;
 using System.Windows.Markup;
 
 namespace AvalonDock.Converters
 {
-    /// <inheritdoc />
-    /// <summary>
-    /// Converts a bool value into a <see cref="Visibility"/> value and back.
-    /// </summary>
-    [ValueConversion(typeof(bool), typeof(Visibility))]
-    public class BoolToVisibilityConverter : MarkupExtension, IValueConverter
-    {
-        /// <inheritdoc />
-        /// <summary>
-        /// Converts a bool value into a <see cref="Visibility"/> value.
-        /// </summary>
-        /// <param name="value">The value produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>
-        /// A converted value. If the method returns null, the valid null value is used.
-        /// </returns>
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            switch (value)
-            {
-                case bool val when targetType == typeof(Visibility):
-                    if (val) return Visibility.Visible;
-                    return parameter is Visibility ? parameter : Visibility.Collapsed;
-                case null when parameter is Visibility:
-                    return parameter;
-                case null:
-                    return Visibility.Collapsed;
-                default:
-                    return Visibility.Visible;
-                    ///throw new ArgumentException("Invalid argument/return type. Expected argument: bool and return type: Visibility");
-            }
-        }
+	/// <inheritdoc />
+	/// <summary>
+	/// Converts a bool value into a <see cref="Visibility"/> value and back.
+	/// </summary>
+	[ValueConversion(typeof(bool), typeof(Visibility))]
+	public class BoolToVisibilityConverter : MarkupExtension, IValueConverter
+	{
+		/// <inheritdoc />
+		/// <summary>
+		/// Converts a bool value into a <see cref="Visibility"/> value.
+		/// </summary>
+		/// <param name="value">The value produced by the binding source.</param>
+		/// <param name="targetType">The type of the binding target property.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>
+		/// A converted value. If the method returns null, the valid null value is used.
+		/// </returns>
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			switch (value)
+			{
+				case bool val when targetType == typeof(Visibility):
+					if (val) return Visibility.Visible;
+					return parameter is Visibility ? parameter : Visibility.Collapsed;
+
+				case null when parameter is Visibility:
+					return parameter;
+
+				case null:
+					return Visibility.Collapsed;
+
+				default:
+					return Visibility.Visible;
+					///throw new ArgumentException("Invalid argument/return type. Expected argument: bool and return type: Visibility");
+			}
+		}
 
-        /// <inheritdoc />
-        /// <summary> 
-        /// Converts a <see cref="Visibility"/> value into a bool value.
-        /// </summary> 
-        /// <param name="value">The value that is produced by the binding target.</param> 
-        /// <param name="targetType">The type to convert to.</param> 
-        /// <param name="parameter">The converter parameter to use.</param> 
-        /// <param name="culture">The culture to use in the converter.</param> 
-        /// <returns> 
-        /// A converted value. If the method returns null, the valid null value is used. 
-        /// </returns> 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (!(value is Visibility)) throw new ArgumentException("Invalid argument type. Expected argument: Visibility.", nameof(value));
-            if (targetType != typeof(bool)) throw new ArgumentException("Invalid return type. Expected type: bool", nameof(targetType));
-            return (Visibility)value == Visibility.Visible;
-        }
+		/// <inheritdoc />
+		/// <summary>
+		/// Converts a <see cref="Visibility"/> value into a bool value.
+		/// </summary>
+		/// <param name="value">The value that is produced by the binding target.</param>
+		/// <param name="targetType">The type to convert to.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>
+		/// A converted value. If the method returns null, the valid null value is used.
+		/// </returns>
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			if (!(value is Visibility)) throw new ArgumentException("Invalid argument type. Expected argument: Visibility.", nameof(value));
+			if (targetType != typeof(bool)) throw new ArgumentException("Invalid return type. Expected type: bool", nameof(targetType));
+			return (Visibility)value == Visibility.Visible;
+		}
 
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return ConverterCreater.Get<BoolToVisibilityConverter>();
-        }
-    }
-}
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return ConverterCreater.Get<BoolToVisibilityConverter>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/ConverterCreater.cs b/source/Components/AvalonDock/Converters/ConverterCreater.cs
index 8e8d122f..e7261c90 100644
--- a/source/Components/AvalonDock/Converters/ConverterCreater.cs
+++ b/source/Components/AvalonDock/Converters/ConverterCreater.cs
@@ -3,37 +3,37 @@
 
 namespace AvalonDock.Converters
 {
-    /// <summary>
-    /// Implements a static factory pattern for instances of WPF converters
-    /// and ensures that every single converter is instanciated only once.
-    /// </summary>
-    internal class ConverterCreater
-    {
-        #region Private fields
+	/// <summary>
+	/// Implements a static factory pattern for instances of WPF converters
+	/// and ensures that every single converter is instanciated only once.
+	/// </summary>
+	internal class ConverterCreater
+	{
+		#region Private fields
 
-        private static readonly Dictionary<Type, object> ConverterMap = new Dictionary<Type, object>();
+		private static readonly Dictionary<Type, object> ConverterMap = new Dictionary<Type, object>();
 
-        #endregion Private fields
+		#endregion Private fields
 
-        #region Public methods
+		#region Public methods
 
-        /// <summary>
-        /// Gets an available instance of the indicated type <see cref="{T}"/> or a brand new instance
-        /// if the indicated type was not created, yet (to be returned on next query of instance for type <see cref="{T}"/>).
-        /// 
-        /// This method ensures that every instance per class <see cref="{T}"/> is instanciated only once.
-        /// </summary>
-        /// <typeparam name="T">Type of class to be returned form this factory.</typeparam>
-        /// <returns></returns>
-        public static T Get<T>() where T : new()
-        {
-            if (!ConverterMap.ContainsKey(typeof(T)))
-            {
-                ConverterMap.Add(typeof(T), new T());
-            }
-            return (T)ConverterMap[typeof(T)];
-        }
+		/// <summary>
+		/// Gets an available instance of the indicated type <see cref="{T}"/> or a brand new instance
+		/// if the indicated type was not created, yet (to be returned on next query of instance for type <see cref="{T}"/>).
+		///
+		/// This method ensures that every instance per class <see cref="{T}"/> is instanciated only once.
+		/// </summary>
+		/// <typeparam name="T">Type of class to be returned form this factory.</typeparam>
+		/// <returns></returns>
+		public static T Get<T>() where T : new()
+		{
+			if (!ConverterMap.ContainsKey(typeof(T)))
+			{
+				ConverterMap.Add(typeof(T), new T());
+			}
+			return (T)ConverterMap[typeof(T)];
+		}
 
-        #endregion Public methods
-    }
+		#endregion Public methods
+	}
 }
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs b/source/Components/AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs
index 0958ba38..02263051 100644
--- a/source/Components/AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs
+++ b/source/Components/AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs
@@ -7,67 +7,67 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Controls;
+using AvalonDock.Layout;
 using System;
 using System.Windows.Data;
-using AvalonDock.Layout;
-using AvalonDock.Controls;
 using System.Windows.Markup;
 
 namespace AvalonDock.Converters
 {
-    /// <summary>
-    /// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutAnchorableItem.HideCommand"/>
-    /// and ensures that other essential properties (Root, Root.Manager) are available.
-    ///
-    /// Returns null or Binding.DoNothing otherwise.
-    /// </summary>
-    public class HideCommandLayoutItemFromLayoutModelConverter : MarkupExtension, IValueConverter
-    {
-        /// <summary>
-        /// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutAnchorableItem.HideCommand"/>
-        /// and ensures that other essential properties (Root, Root.Manager) are available.
-        ///
-        /// Returns null or Binding.DoNothing otherwise.
-        /// </summary>
-        /// <param name="values">The value produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value.</returns>
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            //when this converter is called layout could be constructing so many properties here are potentially not valid
-            if (!(value is LayoutContent layoutModel))
-                return null;
+	/// <summary>
+	/// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutAnchorableItem.HideCommand"/>
+	/// and ensures that other essential properties (Root, Root.Manager) are available.
+	///
+	/// Returns null or Binding.DoNothing otherwise.
+	/// </summary>
+	public class HideCommandLayoutItemFromLayoutModelConverter : MarkupExtension, IValueConverter
+	{
+		/// <summary>
+		/// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutAnchorableItem.HideCommand"/>
+		/// and ensures that other essential properties (Root, Root.Manager) are available.
+		///
+		/// Returns null or Binding.DoNothing otherwise.
+		/// </summary>
+		/// <param name="values">The value produced by the binding source.</param>
+		/// <param name="targetType">The type of the binding target property.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>A converted value.</returns>
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			//when this converter is called layout could be constructing so many properties here are potentially not valid
+			if (!(value is LayoutContent layoutModel))
+				return null;
 
-            if (layoutModel.Root == null)
-                return null;
+			if (layoutModel.Root == null)
+				return null;
 
-            if (layoutModel.Root.Manager == null)
-                return null;
+			if (layoutModel.Root.Manager == null)
+				return null;
 
-            if (!(layoutModel.Root.Manager.GetLayoutItemFromModel(layoutModel) is LayoutAnchorableItem layoutItemModel))
-                return Binding.DoNothing;
+			if (!(layoutModel.Root.Manager.GetLayoutItemFromModel(layoutModel) is LayoutAnchorableItem layoutItemModel))
+				return Binding.DoNothing;
 
-            return layoutItemModel.HideCommand;
-        }
+			return layoutItemModel.HideCommand;
+		}
 
-        /// <summary>
-        /// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="targetType"></param>
-        /// <param name="parameter"></param>
-        /// <param name="culture"></param>
-        /// <returns><see cref="System.NotImplementedException"/></returns>
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary>
+		/// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="targetType"></param>
+		/// <param name="parameter"></param>
+		/// <param name="culture"></param>
+		/// <returns><see cref="System.NotImplementedException"/></returns>
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
 
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return ConverterCreater.Get<HideCommandLayoutItemFromLayoutModelConverter>();
-        }
-    }
-}
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return ConverterCreater.Get<HideCommandLayoutItemFromLayoutModelConverter>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/InverseBoolToVisibilityConverter.cs b/source/Components/AvalonDock/Converters/InverseBoolToVisibilityConverter.cs
index e13d6c5e..1d4f01c3 100644
--- a/source/Components/AvalonDock/Converters/InverseBoolToVisibilityConverter.cs
+++ b/source/Components/AvalonDock/Converters/InverseBoolToVisibilityConverter.cs
@@ -8,53 +8,53 @@ This program is provided to you under the terms of the Microsoft Public
  ************************************************************************/
 
 using System;
-using System.Windows.Data;
 using System.Windows;
+using System.Windows.Data;
 using System.Windows.Markup;
 
 namespace AvalonDock.Converters
 {
-    /// <inheritdoc />
-    /// <summary> 
-    /// Converts an inverted bool value into a <see cref="Visibility"/> value. 
-    /// </summary> 
-    [ValueConversion(typeof(bool), typeof(Visibility))]
-    public class InverseBoolToVisibilityConverter : MarkupExtension, IValueConverter
-    {
-        /// <inheritdoc />
-        /// <summary>Converts an inverted bool value into a <see cref="Visibility"/> value.</summary>
-        /// <param name="value">The value produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (!(value is bool)) throw new ArgumentException("Invalid argument type. Expected argument: bool.", nameof(value));
-            if (targetType != typeof(Visibility)) throw new ArgumentException("Invalid return type. Expected type: Visibility", nameof(targetType));
-            var val = !(bool)value;
-            if (val) return Visibility.Visible;
-            return parameter is Visibility ? parameter : Visibility.Collapsed;
-        }
+	/// <inheritdoc />
+	/// <summary>
+	/// Converts an inverted bool value into a <see cref="Visibility"/> value.
+	/// </summary>
+	[ValueConversion(typeof(bool), typeof(Visibility))]
+	public class InverseBoolToVisibilityConverter : MarkupExtension, IValueConverter
+	{
+		/// <inheritdoc />
+		/// <summary>Converts an inverted bool value into a <see cref="Visibility"/> value.</summary>
+		/// <param name="value">The value produced by the binding source.</param>
+		/// <param name="targetType">The type of the binding target property.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			if (!(value is bool)) throw new ArgumentException("Invalid argument type. Expected argument: bool.", nameof(value));
+			if (targetType != typeof(Visibility)) throw new ArgumentException("Invalid return type. Expected type: Visibility", nameof(targetType));
+			var val = !(bool)value;
+			if (val) return Visibility.Visible;
+			return parameter is Visibility ? parameter : Visibility.Collapsed;
+		}
 
-        /// <inheritdoc />
-        /// <summary>Converts an inverted <see cref="Visibility"/> value into a bool value.</summary>
-        /// <param name="value">The value that is produced by the binding target.</param>
-        /// <param name="targetType">The type to convert to.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (!(value is Visibility)) throw new ArgumentException("Invalid argument type. Expected argument: Visibility.", nameof(value));
-            if (targetType != typeof(bool)) throw new ArgumentException("Invalid return type. Expected type: bool", nameof(targetType));
-            Visibility val = (Visibility)value;
-            return val != Visibility.Visible;
-        }
+		/// <inheritdoc />
+		/// <summary>Converts an inverted <see cref="Visibility"/> value into a bool value.</summary>
+		/// <param name="value">The value that is produced by the binding target.</param>
+		/// <param name="targetType">The type to convert to.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			if (!(value is Visibility)) throw new ArgumentException("Invalid argument type. Expected argument: Visibility.", nameof(value));
+			if (targetType != typeof(bool)) throw new ArgumentException("Invalid return type. Expected type: bool", nameof(targetType));
+			Visibility val = (Visibility)value;
+			return val != Visibility.Visible;
+		}
 
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return ConverterCreater.Get<InverseBoolToVisibilityConverter>();
-        }
-    }
-}
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return ConverterCreater.Get<InverseBoolToVisibilityConverter>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs b/source/Components/AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs
index be9b3549..b590eeed 100644
--- a/source/Components/AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs
+++ b/source/Components/AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs
@@ -7,65 +7,65 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Layout;
 using System;
 using System.Windows.Data;
 using System.Windows.Markup;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Converters
 {
-    /// <summary>
-    /// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutItem"/>
-    /// and ensures that other essential properties (Root, Root.Manager) are available.
-    ///
-    /// Returns null or Binding.DoNothing otherwise.
-    /// </summary>
-    public class LayoutItemFromLayoutModelConverter : MarkupExtension, IValueConverter
-    {
-        /// <summary>
-        /// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutItem"/>
-        /// and ensures that other essential properties (Root, Root.Manager) are available.
-        ///
-        /// Returns null or Binding.DoNothing otherwise.
-        /// </summary>
-        /// <param name="value">The value produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value.</returns>
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (!(value is LayoutContent layoutModel))
-                return null;
+	/// <summary>
+	/// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutItem"/>
+	/// and ensures that other essential properties (Root, Root.Manager) are available.
+	///
+	/// Returns null or Binding.DoNothing otherwise.
+	/// </summary>
+	public class LayoutItemFromLayoutModelConverter : MarkupExtension, IValueConverter
+	{
+		/// <summary>
+		/// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutItem"/>
+		/// and ensures that other essential properties (Root, Root.Manager) are available.
+		///
+		/// Returns null or Binding.DoNothing otherwise.
+		/// </summary>
+		/// <param name="value">The value produced by the binding source.</param>
+		/// <param name="targetType">The type of the binding target property.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>A converted value.</returns>
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			if (!(value is LayoutContent layoutModel))
+				return null;
 
-            if (layoutModel.Root == null)
-                return null;
+			if (layoutModel.Root == null)
+				return null;
 
-            if (layoutModel.Root.Manager == null)
-                return null;
+			if (layoutModel.Root.Manager == null)
+				return null;
 
-            if (layoutModel.Root.Manager.GetLayoutItemFromModel(layoutModel) == null)
-                return Binding.DoNothing;
+			if (layoutModel.Root.Manager.GetLayoutItemFromModel(layoutModel) == null)
+				return Binding.DoNothing;
 
-            return layoutModel.Root.Manager.GetLayoutItemFromModel(layoutModel);
-        }
+			return layoutModel.Root.Manager.GetLayoutItemFromModel(layoutModel);
+		}
 
-        /// <summary>
-        /// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="targetType"></param>
-        /// <param name="parameter"></param>
-        /// <param name="culture"></param>
-        /// <returns><see cref="System.NotImplementedException"/></returns>
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary>
+		/// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="targetType"></param>
+		/// <param name="parameter"></param>
+		/// <param name="culture"></param>
+		/// <returns><see cref="System.NotImplementedException"/></returns>
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
 
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return ConverterCreater.Get<LayoutItemFromLayoutModelConverter>();
-        }
-    }
-}
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return ConverterCreater.Get<LayoutItemFromLayoutModelConverter>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/NamespaceDoc.cs b/source/Components/AvalonDock/Converters/NamespaceDoc.cs
index bba237b1..21fa5a2a 100644
--- a/source/Components/AvalonDock/Converters/NamespaceDoc.cs
+++ b/source/Components/AvalonDock/Converters/NamespaceDoc.cs
@@ -5,4 +5,4 @@ namespace AvalonDock.Converters
 	internal class NamespaceDoc
 	{
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/NullToDoNothingConverter.cs b/source/Components/AvalonDock/Converters/NullToDoNothingConverter.cs
index c8a6ee81..a01efa4a 100644
--- a/source/Components/AvalonDock/Converters/NullToDoNothingConverter.cs
+++ b/source/Components/AvalonDock/Converters/NullToDoNothingConverter.cs
@@ -13,43 +13,43 @@ This program is provided to you under the terms of the Microsoft Public
 
 namespace AvalonDock.Converters
 {
-    /// <summary>
-    /// Converts any null value into Binding.DoNothing and returns the bound value, otherwise.
-    /// </summary>
-    public class NullToDoNothingConverter : MarkupExtension, IValueConverter
-    {
-        /// <summary>
-        /// Converts any null value into Binding.DoNothing and returns the bound value, otherwise.
-        /// </summary>
-        /// <param name="value">The value produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value.</returns>
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (value == null)
-                return Binding.DoNothing;
+	/// <summary>
+	/// Converts any null value into Binding.DoNothing and returns the bound value, otherwise.
+	/// </summary>
+	public class NullToDoNothingConverter : MarkupExtension, IValueConverter
+	{
+		/// <summary>
+		/// Converts any null value into Binding.DoNothing and returns the bound value, otherwise.
+		/// </summary>
+		/// <param name="value">The value produced by the binding source.</param>
+		/// <param name="targetType">The type of the binding target property.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>A converted value.</returns>
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			if (value == null)
+				return Binding.DoNothing;
 
-            return value;
-        }
+			return value;
+		}
 
-        /// <summary>
-        /// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="targetType"></param>
-        /// <param name="parameter"></param>
-        /// <param name="culture"></param>
-        /// <returns><see cref="System.NotImplementedException"/></returns>
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary>
+		/// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="targetType"></param>
+		/// <param name="parameter"></param>
+		/// <param name="culture"></param>
+		/// <returns><see cref="System.NotImplementedException"/></returns>
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
 
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return ConverterCreater.Get<NullToDoNothingConverter>();
-        }
-    }
-}
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return ConverterCreater.Get<NullToDoNothingConverter>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/OverlayWindowToVisibilityConverter.cs b/source/Components/AvalonDock/Converters/OverlayWindowToVisibilityConverter.cs
index 1dc6a76c..98d55d21 100644
--- a/source/Components/AvalonDock/Converters/OverlayWindowToVisibilityConverter.cs
+++ b/source/Components/AvalonDock/Converters/OverlayWindowToVisibilityConverter.cs
@@ -7,55 +7,55 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Controls;
+using AvalonDock.Layout;
 using System;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
-using AvalonDock.Controls;
-using AvalonDock.Layout;
 
 namespace AvalonDock.Converters
 {
-    /// <summary>
-    /// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutItem"/>
-    /// and ensures that other essential properties (Root, Root.Manager) are available.
-    ///
-    /// Returns null or Binding.DoNothing otherwise.
-    /// </summary>
-    public class OverlayWindowToVisibilityConverter : MarkupExtension, IValueConverter
-    {
-        /// <summary>
-        /// Converts a <see cref="OverlayWindow"/> into a <see cref="Visibility"/>.
-        /// </summary>
-        /// <param name="value">The value produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value.</returns>
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            bool isHostedInFloatingWindow = value is OverlayWindow overlayWindow && overlayWindow.IsHostedInFloatingWindow;
-            if (parameter == null || !bool.TryParse(parameter.ToString(), out bool isLarge))
-            {
-                isLarge = false;
-            }
+	/// <summary>
+	/// Converts a <see cref="LayoutContent"/> into a <see cref="LayoutItem"/>
+	/// and ensures that other essential properties (Root, Root.Manager) are available.
+	///
+	/// Returns null or Binding.DoNothing otherwise.
+	/// </summary>
+	public class OverlayWindowToVisibilityConverter : MarkupExtension, IValueConverter
+	{
+		/// <summary>
+		/// Converts a <see cref="OverlayWindow"/> into a <see cref="Visibility"/>.
+		/// </summary>
+		/// <param name="value">The value produced by the binding source.</param>
+		/// <param name="targetType">The type of the binding target property.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>A converted value.</returns>
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			bool isHostedInFloatingWindow = value is OverlayWindow overlayWindow && overlayWindow.IsHostedInFloatingWindow;
+			if (parameter == null || !bool.TryParse(parameter.ToString(), out bool isLarge))
+			{
+				isLarge = false;
+			}
 
-            return isHostedInFloatingWindow && isLarge ? Visibility.Hidden : Visibility.Visible;
-        }
+			return isHostedInFloatingWindow && isLarge ? Visibility.Hidden : Visibility.Visible;
+		}
 
-        /// <summary>
-        /// Method is not implemented and will raise <see cref="System.NotSupportedException"/> when called.
-        /// </summary>
-        /// <param name="value">The value that is produced by the binding target.</param>
-        /// <param name="targetType">The type to convert to.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns><see cref="System.NotSupportedException"/></returns>
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) => throw new NotSupportedException();
+		/// <summary>
+		/// Method is not implemented and will raise <see cref="System.NotSupportedException"/> when called.
+		/// </summary>
+		/// <param name="value">The value that is produced by the binding target.</param>
+		/// <param name="targetType">The type to convert to.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns><see cref="System.NotSupportedException"/></returns>
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) => throw new NotSupportedException();
 
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return ConverterCreater.Get<OverlayWindowToVisibilityConverter>();
-        }
-    }
-}
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return ConverterCreater.Get<OverlayWindowToVisibilityConverter>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Converters/UriSourceToBitmapImageConverter.cs b/source/Components/AvalonDock/Converters/UriSourceToBitmapImageConverter.cs
index 86ef8ca2..16d8e7d6 100644
--- a/source/Components/AvalonDock/Converters/UriSourceToBitmapImageConverter.cs
+++ b/source/Components/AvalonDock/Converters/UriSourceToBitmapImageConverter.cs
@@ -8,56 +8,56 @@ This program is provided to you under the terms of the Microsoft Public
  ************************************************************************/
 
 using System;
-using System.Windows.Data;
-using System.Windows.Media.Imaging;
 using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Markup;
+using System.Windows.Media.Imaging;
 
 namespace AvalonDock.Converters
 {
-    /// <summary>
-    /// Converts a <see cref="Uri"/> object into a corresponding <see cref="Image"/> object
-    /// that is expected to be available at the given target of the uri.
-    ///
-    /// Returns null or Binding.DoNothing otherwise.
-    /// </summary>
-    public class UriSourceToBitmapImageConverter : MarkupExtension, IValueConverter
-    {
-        /// <summary>
-        /// Converts a <see cref="Uri"/> object into a corresponding <see cref="Image"/> object
-        /// that is expected to be available at the given target of the uri.
-        ///
-        /// Returns null or Binding.DoNothing otherwise.
-        /// </summary>
-        /// <param name="value">The value produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value.</returns>
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (value == null)
-                return Binding.DoNothing;
+	/// <summary>
+	/// Converts a <see cref="Uri"/> object into a corresponding <see cref="Image"/> object
+	/// that is expected to be available at the given target of the uri.
+	///
+	/// Returns null or Binding.DoNothing otherwise.
+	/// </summary>
+	public class UriSourceToBitmapImageConverter : MarkupExtension, IValueConverter
+	{
+		/// <summary>
+		/// Converts a <see cref="Uri"/> object into a corresponding <see cref="Image"/> object
+		/// that is expected to be available at the given target of the uri.
+		///
+		/// Returns null or Binding.DoNothing otherwise.
+		/// </summary>
+		/// <param name="value">The value produced by the binding source.</param>
+		/// <param name="targetType">The type of the binding target property.</param>
+		/// <param name="parameter">The converter parameter to use.</param>
+		/// <param name="culture">The culture to use in the converter.</param>
+		/// <returns>A converted value.</returns>
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			if (value == null)
+				return Binding.DoNothing;
 
-            return new Image() { Source = new BitmapImage((Uri)value) };
-        }
+			return new Image() { Source = new BitmapImage((Uri)value) };
+		}
 
-        /// <summary>
-        /// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="targetType"></param>
-        /// <param name="parameter"></param>
-        /// <param name="culture"></param>
-        /// <returns><see cref="System.NotImplementedException"/></returns>
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+		/// <summary>
+		/// Method is not implemented and will raise <see cref="System.NotImplementedException"/> when called.
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="targetType"></param>
+		/// <param name="parameter"></param>
+		/// <param name="culture"></param>
+		/// <returns><see cref="System.NotImplementedException"/></returns>
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
 
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return ConverterCreater.Get<UriSourceToBitmapImageConverter>();
-        }
-    }
-}
+		public override object ProvideValue(IServiceProvider serviceProvider)
+		{
+			return ConverterCreater.Get<UriSourceToBitmapImageConverter>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/DockingManager.cs b/source/Components/AvalonDock/DockingManager.cs
index e77bd336..8af3c8db 100644
--- a/source/Components/AvalonDock/DockingManager.cs
+++ b/source/Components/AvalonDock/DockingManager.cs
@@ -7,814 +7,816 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Controls;
+using AvalonDock.Layout;
+using AvalonDock.Themes;
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Diagnostics;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
-using System.Windows.Markup;
-using System.ComponentModel;
-using System.Windows.Interop;
-using AvalonDock.Layout;
-using AvalonDock.Controls;
-using System.Windows.Input;
-using System.Collections;
-using System.Collections.Specialized;
+using System.Windows.Controls;
 using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Markup;
 using System.Windows.Threading;
-using AvalonDock.Themes;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 
 namespace AvalonDock
 {
-    /// <inheritdoc cref="Control"/>
-    /// <inheritdoc cref="IOverlayWindowHost"/>
-    /// <summary>
-    /// The <see cref="DockingManager"/> is the custom control at the root of the visual tree.
-    /// This control is the core control of AvalonDock.
-    /// It contains core dependency properties, events, and methods to customize and
-    /// manage many aspects of the docking framework.
-    /// </summary>
-    /// <seealso cref="Control"/>
-    /// <seealso cref="IOverlayWindowHost"/>
-    [ContentProperty(nameof(Layout))]
-    [TemplatePart(Name = "PART_AutoHideArea")]
-    public class DockingManager : Control, IOverlayWindowHost//, ILogicalChildrenContainer
-    {
-        #region fields
-        private ResourceDictionary currentThemeResourceDictionary; // = null
-        private AutoHideWindowManager _autoHideWindowManager;
-        private FrameworkElement _autohideArea;
-        private readonly List<LayoutFloatingWindowControl> _fwList = new List<LayoutFloatingWindowControl>();
-        private readonly List<LayoutFloatingWindowControl> _fwHiddenList = new List<LayoutFloatingWindowControl>();
-        private OverlayWindow _overlayWindow = null;
-        private List<IDropArea> _areas = null;
-        private bool _insideInternalSetActiveContent = false;
-
-        // Collection of LayoutDocumentItems & LayoutAnchorableItems attached to their corresponding
-        // LayoutDocument & LayoutAnchorable
-        private readonly List<LayoutItem> _layoutItems = new List<LayoutItem>();
-
-        private bool _suspendLayoutItemCreation = false;
-        private DispatcherOperation _collectLayoutItemsOperations = null;
-        private NavigatorWindow _navigatorWindow = null;
-
-        internal bool SuspendDocumentsSourceBinding = false;
-        internal bool SuspendAnchorablesSourceBinding = false;
-        #endregion fields
-
-        #region Constructors
-        /// <summary>
-        /// Static class constructor to support WPF property control registration.
-        /// </summary>
-        static DockingManager()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(DockingManager), new FrameworkPropertyMetadata(typeof(DockingManager)));
-            FocusableProperty.OverrideMetadata(typeof(DockingManager), new FrameworkPropertyMetadata(false));
-            HwndSource.DefaultAcquireHwndFocusInMenuMode = false;
-        }
-
-        /// <summary>
-        /// Class constructor.
-        /// </summary>
-        public DockingManager()
-        {
-            IsVirtualizingDocument = true;
-            IsVirtualizingAnchorable = true;
+	/// <inheritdoc cref="Control"/>
+	/// <inheritdoc cref="IOverlayWindowHost"/>
+	/// <summary>
+	/// The <see cref="DockingManager"/> is the custom control at the root of the visual tree.
+	/// This control is the core control of AvalonDock.
+	/// It contains core dependency properties, events, and methods to customize and
+	/// manage many aspects of the docking framework.
+	/// </summary>
+	/// <seealso cref="Control"/>
+	/// <seealso cref="IOverlayWindowHost"/>
+	[ContentProperty(nameof(Layout))]
+	[TemplatePart(Name = "PART_AutoHideArea")]
+	public class DockingManager : Control, IOverlayWindowHost//, ILogicalChildrenContainer
+	{
+		#region fields
+
+		private AutoHideWindowManager _autoHideWindowManager;
+		private FrameworkElement _autohideArea;
+		private readonly List<LayoutFloatingWindowControl> _fwList = new List<LayoutFloatingWindowControl>();
+		private readonly List<LayoutFloatingWindowControl> _fwHiddenList = new List<LayoutFloatingWindowControl>();
+		private OverlayWindow _overlayWindow = null;
+		private List<IDropArea> _areas = null;
+		private bool _insideInternalSetActiveContent = false;
+
+		// Collection of LayoutDocumentItems & LayoutAnchorableItems attached to their corresponding
+		// LayoutDocument & LayoutAnchorable
+		private readonly List<LayoutItem> _layoutItems = new List<LayoutItem>();
+
+		private bool _suspendLayoutItemCreation = false;
+		private DispatcherOperation _collectLayoutItemsOperations = null;
+		private NavigatorWindow _navigatorWindow = null;
+
+		internal bool SuspendDocumentsSourceBinding = false;
+		internal bool SuspendAnchorablesSourceBinding = false;
+
+		#endregion fields
+
+		#region Constructors
+
+		/// <summary>
+		/// Static class constructor to support WPF property control registration.
+		/// </summary>
+		static DockingManager()
+		{
+			DefaultStyleKeyProperty.OverrideMetadata(typeof(DockingManager), new FrameworkPropertyMetadata(typeof(DockingManager)));
+			FocusableProperty.OverrideMetadata(typeof(DockingManager), new FrameworkPropertyMetadata(false));
+			HwndSource.DefaultAcquireHwndFocusInMenuMode = false;
+		}
+
+		/// <summary>
+		/// Class constructor.
+		/// </summary>
+		public DockingManager()
+		{
+			IsVirtualizingDocument = true;
+			IsVirtualizingAnchorable = true;
 
 #if !VS2008
-            Layout = new LayoutRoot { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) };
+			Layout = new LayoutRoot { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) };
 #else
           this.SetCurrentValue( DockingManager.LayoutProperty, new LayoutRoot() { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) } );
 #endif
-            Loaded += DockingManager_Loaded;
-            Unloaded += DockingManager_Unloaded;
-        }
-
-        #endregion Constructors
+			Loaded += DockingManager_Loaded;
+			Unloaded += DockingManager_Unloaded;
+		}
+
+		#endregion Constructors
 
-        #region Events
-
-        /// <summary>Event fired when <see cref="DockingManager.Layout"/> property changes.</summary>
-        /// <seealso cref="Layout"/>
-        public event EventHandler LayoutChanged;
-
-        /// <summary>Event fired when <see cref="DockingManager.Layout"/> property is about to be changed.</summary>
-        /// <seealso cref="Layout"/>
-        public event EventHandler LayoutChanging;
-
-        /// <summary>Event fired when a document is about to be closed.</summary>
-        /// <remarks>Subscribers have the opportunity to cancel the operation.</remarks>
-        public event EventHandler<DocumentClosingEventArgs> DocumentClosing;
-
-        /// <summary>Event fired after a document is closed.</summary>
-        public event EventHandler<DocumentClosedEventArgs> DocumentClosed;
-
-        /// <summary>Event is raised when <see cref="ActiveContent"/> changes.</summary>
-        /// <seealso cref="ActiveContent"/>
-        public event EventHandler ActiveContentChanged;
-
-        #endregion Events
-
-        #region Public Properties
-
-        #region Layout
-
-        /// <summary><see cref="Layout"/> dependency property.</summary>
-        public static readonly DependencyProperty LayoutProperty = DependencyProperty.Register(nameof(Layout), typeof(LayoutRoot), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnLayoutChanged, CoerceLayoutValue));
-
-        /// <summary>Gets/sets the layout root of the layout tree managed in this framework.</summary>
-        [Bindable(true), Description("Gets/sets the layout root of the layout tree managed in this framework."), Category("Layout")]
-        public LayoutRoot Layout
-        {
-            get => (LayoutRoot)GetValue(LayoutProperty);
-            set => SetValue(LayoutProperty, value);
-        }
-
-        /// <summary>Coerces the <see cref="Layout"/> value.</summary>
-        private static object CoerceLayoutValue(DependencyObject d, object value)
-        {
-            if (value == null) return new LayoutRoot { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) };
-            ((DockingManager)d).OnLayoutChanging(value as LayoutRoot);
-            return value;
-        }
-
-        /// <summary>Handles changes to the <see cref="Layout"/> property.</summary>
-        private static void OnLayoutChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLayoutChanged(e.OldValue as LayoutRoot, e.NewValue as LayoutRoot);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="Layout"/> property.</summary>
-        protected virtual void OnLayoutChanged(LayoutRoot oldLayout, LayoutRoot newLayout)
-        {
-            if (oldLayout != null)
-            {
-                oldLayout.PropertyChanged -= OnLayoutRootPropertyChanged;
-                oldLayout.Updated -= OnLayoutRootUpdated;
-            }
-
-            foreach (var fwc in _fwList.ToArray())
-            {
-                fwc.KeepContentVisibleOnClose = true;
-                fwc.InternalClose();
-            }
-
-            _fwList.Clear();
-
-            foreach (var fwc in _fwHiddenList.ToArray())
-            {
-                fwc.InternalClose();
-            }
-
-            _fwHiddenList.Clear();
-            DetachDocumentsSource(oldLayout, DocumentsSource);
-            DetachAnchorablesSource(oldLayout, AnchorablesSource);
-
-            if (oldLayout != null && oldLayout.Manager == this)
-                oldLayout.Manager = null;
-
-            ClearLogicalChildrenList();
-            DetachLayoutItems();
-
-            Layout.Manager = this;
-
-            AttachLayoutItems();
-            AttachDocumentsSource(newLayout, DocumentsSource);
-            AttachAnchorablesSource(newLayout, AnchorablesSource);
-
-            if (IsLoaded)
-            {
-                LayoutRootPanel = CreateUIElementForModel(Layout.RootPanel) as LayoutPanelControl;
-                LeftSidePanel = CreateUIElementForModel(Layout.LeftSide) as LayoutAnchorSideControl;
-                TopSidePanel = CreateUIElementForModel(Layout.TopSide) as LayoutAnchorSideControl;
-                RightSidePanel = CreateUIElementForModel(Layout.RightSide) as LayoutAnchorSideControl;
-                BottomSidePanel = CreateUIElementForModel(Layout.BottomSide) as LayoutAnchorSideControl;
-
-                foreach (var fw in Layout.FloatingWindows.ToArray())
-                    if (fw.IsValid)
-                        _fwList.Add(CreateUIElementForModel(fw) as LayoutFloatingWindowControl);
-
-                foreach (var fw in _fwList.ToArray())
-                {
-                    if (fw.Model is LayoutAnchorableFloatingWindow window && window.RootPanel.IsMaximized)
-                    {
-                        fw.WindowState = WindowState.Normal;
-                        fw.Show();
-                        fw.WindowState = WindowState.Maximized;
-                    }
-                    else
-                    {
-                        if (fw.Content != null || (fw.Model as LayoutAnchorableFloatingWindow)?.IsVisible == true)
-                            fw.Show();
-                        else
-                            fw.Hide();
-                    }
-
-                    //fw.Owner = Window.GetWindow(this);
-                    //fw.SetParentToMainWindowOf(this);
-                }
-
-                // In order to prevent resource leaks, unsubscribe from SizeChanged event for case when user call loading of Layout Settigns.
-                SizeChanged -= OnSizeChanged;
-                SizeChanged += OnSizeChanged;
-            }
-
-            if (newLayout != null)
-            {
-                newLayout.PropertyChanged += OnLayoutRootPropertyChanged;
-                newLayout.Updated += OnLayoutRootUpdated;
-            }
-
-            LayoutChanged?.Invoke(this, EventArgs.Empty);
-            //    Layout?.CollectGarbage();
-            CommandManager.InvalidateRequerySuggested();
-        }
-
-        #endregion Layout
-
-        #region LayoutUpdateStrategy
-
-        /// <summary><see cref="LayoutUpdateStrategy"/> dependency property.</summary>
-        public static readonly DependencyProperty LayoutUpdateStrategyProperty = DependencyProperty.Register(nameof(LayoutUpdateStrategy), typeof(ILayoutUpdateStrategy), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ILayoutUpdateStrategy)null));
-
-        /// <summary>
-        /// Gets/sets the layout strategy class that can be to called by the framework when it needs to position a <see cref="LayoutAnchorable"/> inside an existing layout.
-        /// </summary>
-        /// <remarks>Sometimes it's impossible to automatically insert an anchorable in the layout without specifing the target parent pane.
-        /// Set this property to an object that will be asked to insert the anchorable to the desidered position.</remarks>
-        [Bindable(true), Description("Gets/sets the layout strategy class that can be to called by the framework when it needs to position a LayoutAnchorable inside an existing layout."), Category("Layout")]
-        public ILayoutUpdateStrategy LayoutUpdateStrategy
-        {
-            get => (ILayoutUpdateStrategy)GetValue(LayoutUpdateStrategyProperty);
-            set => SetValue(LayoutUpdateStrategyProperty, value);
-        }
-
-        #endregion LayoutUpdateStrategy
-
-        #region DocumentPaneTemplate
-
-        /// <summary><see cref="DocumentPaneTemplate"/> dependency property.</summary>
-        public static readonly DependencyProperty DocumentPaneTemplateProperty = DependencyProperty.Register(nameof(DocumentPaneTemplate), typeof(ControlTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnDocumentPaneTemplateChanged));
-
-        /// <summary>Gets/sets the <see cref="ControlTemplate"/> that can be used to render the <see cref="LayoutDocumentPaneControl"/>.</summary>
-        [Bindable(true), Description("Gets/sets the ControlTemplate´that can be used to render the LayoutDocumentPaneControl."), Category("Document")]
-        public ControlTemplate DocumentPaneTemplate
-        {
-            get => (ControlTemplate)GetValue(DocumentPaneTemplateProperty);
-            set => SetValue(DocumentPaneTemplateProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="DocumentPaneTemplate"/> property.</summary>
-        private static void OnDocumentPaneTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).OnDocumentPaneTemplateChanged(e);
-        }
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentPaneTemplate"/> property.</summary>
-        protected virtual void OnDocumentPaneTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        #endregion DocumentPaneTemplate
-
-        #region AnchorablePaneTemplate
-
-        /// <summary>
-        /// <see cref="AnchorablePaneTemplate"/> dependency property
-        /// </summary>
-        public static readonly DependencyProperty AnchorablePaneTemplateProperty = DependencyProperty.Register(nameof(AnchorablePaneTemplate), typeof(ControlTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnAnchorablePaneTemplateChanged));
-
-        /// <summary>Gets/sets the <see cref="ControlTemplate"/> used to render <see cref="LayoutAnchorablePaneControl"/>.</summary>
-        [Bindable(true), Description("Gets/sets the ControlTemplate used to render LayoutAnchorablePaneControl"), Category("Anchorable")]
-        public ControlTemplate AnchorablePaneTemplate
-        {
-            get => (ControlTemplate)GetValue(AnchorablePaneTemplateProperty);
-            set => SetValue(AnchorablePaneTemplateProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="AnchorablePaneTemplate"/> property.</summary>
-        private static void OnAnchorablePaneTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorablePaneTemplateChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorablePaneTemplate"/> property.</summary>
-        protected virtual void OnAnchorablePaneTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        #endregion AnchorablePaneTemplate
-
-        #region AnchorSideTemplate
-
-        /// <summary>The <see cref="AnchorSideTemplate"/> dependency property.</summary>
-        public static readonly DependencyProperty AnchorSideTemplateProperty = DependencyProperty.Register(nameof(AnchorSideTemplate), typeof(ControlTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ControlTemplate)null));
-
-        /// <summary>Gets/sets the <see cref="ControlTemplate"/> used to render <see cref="LayoutAnchorSideControl"/>.</summary>
-        [Bindable(true), Description("Gets/sets the ControlTemplate used to render LayoutAnchorSideControl."), Category("Anchor")]
-        public ControlTemplate AnchorSideTemplate
-        {
-            get => (ControlTemplate)GetValue(AnchorSideTemplateProperty);
-            set => SetValue(AnchorSideTemplateProperty, value);
-        }
-
-        #endregion AnchorSideTemplate
-
-        #region AnchorGroupTemplate
-
-        /// <summary><see cref="AnchorGroupTemplate"/> dependency property.</summary>
-        public static readonly DependencyProperty AnchorGroupTemplateProperty = DependencyProperty.Register(nameof(AnchorGroupTemplate), typeof(ControlTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ControlTemplate)null));
-
-        /// <summary>Gets/sets the <see cref="ControlTemplate"/> used to render the <see cref="LayoutAnchorGroupControl"/>.</summary>
-        [Bindable(true), Description("Gets/sets the ControlTemplate used to render LayoutAnchorGroupControl."), Category("Anchor")]
-        public ControlTemplate AnchorGroupTemplate
-        {
-            get => (ControlTemplate)GetValue(AnchorGroupTemplateProperty);
-            set => SetValue(AnchorGroupTemplateProperty, value);
-        }
-
-        #endregion AnchorGroupTemplate
-
-        #region AnchorTemplate
-
-        /// <summary><see cref="AnchorTemplate"/> dependency property.</summary>
-        public static readonly DependencyProperty AnchorTemplateProperty = DependencyProperty.Register(nameof(AnchorTemplate), typeof(ControlTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ControlTemplate)null));
-
-        /// <summary>Gets/sets the <see cref="ControlTemplate"/> used to render a <see cref="LayoutAnchorControl"/>.</summary>
-        [Bindable(true), Description("Gets/sets the ControlTemplate used to render a LayoutAnchorControl."), Category("Anchor")]
-        public ControlTemplate AnchorTemplate
-        {
-            get => (ControlTemplate)GetValue(AnchorTemplateProperty);
-            set => SetValue(AnchorTemplateProperty, value);
-        }
-
-        #endregion AnchorTemplate
-
-        #region DocumentPaneControlStyle
-
-        /// <summary><see cref="DocumentPaneControlStyle"/> dependency property.</summary>
-        public static readonly DependencyProperty DocumentPaneControlStyleProperty = DependencyProperty.Register(nameof(DocumentPaneControlStyle), typeof(Style), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnDocumentPaneControlStyleChanged));
-
-        /// <summary>Gets/sets the style of a <see cref="LayoutDocumentPaneControl"/>.</summary>
-        [Bindable(true), Description("Gets/sets the style of a LayoutDocumentPaneControl."), Category("Document")]
-        public Style DocumentPaneControlStyle
-        {
-            get => (Style)GetValue(DocumentPaneControlStyleProperty);
-            set => SetValue(DocumentPaneControlStyleProperty, value);
-        }
-
-        /// <summary>Handles changes to the DocumentPaneControlStyle property.</summary>
-        private static void OnDocumentPaneControlStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentPaneControlStyleChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentPaneControlStyle"/> property.</summary>
-        protected virtual void OnDocumentPaneControlStyleChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        #endregion DocumentPaneControlStyle
-
-        #region AnchorablePaneControlStyle
-
-        /// <summary><see cref="AnchorablePaneControlStyle"/> dependency property.</summary>
-        public static readonly DependencyProperty AnchorablePaneControlStyleProperty = DependencyProperty.Register(nameof(AnchorablePaneControlStyle), typeof(Style), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnAnchorablePaneControlStyleChanged));
-
-        /// <summary>Gets/sets the <see cref="Style"/> to apply to <see cref="LayoutAnchorablePaneControl"/>.</summary>
-        [Bindable(true), Description("Gets/sets the Style to apply to LayoutAnchorablePaneControl."), Category("Anchorable")]
-        public Style AnchorablePaneControlStyle
-        {
-            get => (Style)GetValue(AnchorablePaneControlStyleProperty);
-            set => SetValue(AnchorablePaneControlStyleProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="AnchorablePaneControlStyle"/> property.</summary>
-        private static void OnAnchorablePaneControlStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorablePaneControlStyleChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorablePaneControlStyle"/> property.</summary>
-        protected virtual void OnAnchorablePaneControlStyleChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        #endregion AnchorablePaneControlStyle
-
-        #region DocumentHeaderTemplate
-
-        /// <summary><see cref="DocumentHeaderTemplate"/> dependency property.</summary>
-        public static readonly DependencyProperty DocumentHeaderTemplateProperty = DependencyProperty.Register(nameof(DocumentHeaderTemplate), typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplate)null, OnDocumentHeaderTemplateChanged, CoerceDocumentHeaderTemplateValue));
-
-        /// <summary>Gets/sets the <see cref="DataTemplate"/> to use for document headers.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplate to use for document headers."), Category("Document")]
-        public DataTemplate DocumentHeaderTemplate
-        {
-            get => (DataTemplate)GetValue(DocumentHeaderTemplateProperty);
-            set => SetValue(DocumentHeaderTemplateProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="DocumentHeaderTemplate"/> property.</summary>
-        private static void OnDocumentHeaderTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentHeaderTemplateChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentHeaderTemplate"/> property.</summary>
-        protected virtual void OnDocumentHeaderTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        /// <summary>Coerces the <see cref="DocumentHeaderTemplate"/> value.</summary>
-        private static object CoerceDocumentHeaderTemplateValue(DependencyObject d, object value)
-        {
-            if (value != null && d.GetValue(DocumentHeaderTemplateSelectorProperty) != null)
-                return null;
-            return value;
-        }
-
-        #endregion DocumentHeaderTemplate
-
-        #region DocumentHeaderTemplateSelector
-
-        /// <summary><see cref="DocumentHeaderTemplateSelector"/> dependency property.</summary>
-        public static readonly DependencyProperty DocumentHeaderTemplateSelectorProperty = DependencyProperty.Register(nameof(DocumentHeaderTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnDocumentHeaderTemplateSelectorChanged, CoerceDocumentHeaderTemplateSelectorValue));
-
-        /// <summary>Gets /sets the <see cref="DataTemplateSelector"/> that can be used for selecting a <see cref="DataTemplate"/> for a document header.</summary>
-        [Bindable(true), Description("Gets /sets the DataTemplateSelector that can be used for selecting a DataTemplates for a document header."), Category("Document")]
-        public DataTemplateSelector DocumentHeaderTemplateSelector
-        {
-            get => (DataTemplateSelector)GetValue(DocumentHeaderTemplateSelectorProperty);
-            set => SetValue(DocumentHeaderTemplateSelectorProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="DocumentHeaderTemplateSelector"/> property.</summary>
-        private static void OnDocumentHeaderTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentHeaderTemplateSelectorChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentHeaderTemplateSelector"/> property.</summary>
-        protected virtual void OnDocumentHeaderTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue != null && DocumentHeaderTemplate != null)
-                DocumentHeaderTemplate = null;
-            if (DocumentPaneMenuItemHeaderTemplateSelector == null)
-                DocumentPaneMenuItemHeaderTemplateSelector = DocumentHeaderTemplateSelector;
-        }
-
-        /// <summary>Coerces the <see cref="DocumentHeaderTemplateSelector"/> value.</summary>
-        private static object CoerceDocumentHeaderTemplateSelectorValue(DependencyObject d, object value) => value;
-
-        #endregion DocumentHeaderTemplateSelector
-
-        #region DocumentTitleTemplate
-
-        /// <summary><see cref="DocumentTitleTemplate"/> dependency property.</summary>
-        public static readonly DependencyProperty DocumentTitleTemplateProperty = DependencyProperty.Register(nameof(DocumentTitleTemplate), typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnDocumentTitleTemplateChanged, CoerceDocumentTitleTemplateValue));
-
-        /// <summary>Gets/sets the <see cref="DataTemplate"/> to use for displaying the title of a document.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplate to use for displaying the title of a document."), Category("Document")]
-        public DataTemplate DocumentTitleTemplate
-        {
-            get => (DataTemplate)GetValue(DocumentTitleTemplateProperty);
-            set => SetValue(DocumentTitleTemplateProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="DocumentTitleTemplate"/> property.</summary>
-        private static void OnDocumentTitleTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentTitleTemplateChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentTitleTemplate"/> property.</summary>
-        protected virtual void OnDocumentTitleTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        /// <summary>Coerces the <see cref="DocumentTitleTemplate"/> value.</summary>
-        private static object CoerceDocumentTitleTemplateValue(DependencyObject d, object value)
-        {
-            if (value != null && d.GetValue(DocumentTitleTemplateSelectorProperty) != null)
-                return null;
-            return value;
-        }
-
-        #endregion DocumentTitleTemplate
-
-        #region DocumentTitleTemplateSelector
-
-        /// <summary><see cref="DocumentTitleTemplateSelector"/> dependency property.</summary>
-        public static readonly DependencyProperty DocumentTitleTemplateSelectorProperty = DependencyProperty.Register(nameof(DocumentTitleTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnDocumentTitleTemplateSelectorChanged, CoerceDocumentTitleTemplateSelectorValue));
-
-        /// <summary>Gets/sets the <see cref="DataTemplateSelector"/> to use for displaying the <see cref="DataTemplate"/> of a document's title.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplateSelector to use for displaying the DataTemplate of a document's title."), Category("Document")]
-        public DataTemplateSelector DocumentTitleTemplateSelector
-        {
-            get => (DataTemplateSelector)GetValue(DocumentTitleTemplateSelectorProperty);
-            set => SetValue(DocumentTitleTemplateSelectorProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="DocumentTitleTemplateSelector"/> property.</summary>
-        private static void OnDocumentTitleTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentTitleTemplateSelectorChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentTitleTemplateSelector"/> property.</summary>
-        protected virtual void OnDocumentTitleTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue != null)
-                DocumentTitleTemplate = null;
-        }
-
-        /// <summary>Coerces the <see cref="DocumentTitleTemplateSelector"/> value.</summary>
-        private static object CoerceDocumentTitleTemplateSelectorValue(DependencyObject d, object value) => value;
-
-        #endregion DocumentTitleTemplateSelector
-
-        #region AnchorableTitleTemplate
-
-        /// <summary><see cref="AnchorableTitleTemplate"/> dependency property.</summary>
-        public static readonly DependencyProperty AnchorableTitleTemplateProperty = DependencyProperty.Register(nameof(AnchorableTitleTemplate), typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplate)null, OnAnchorableTitleTemplateChanged, CoerceAnchorableTitleTemplateValue));
-
-        /// <summary>Gets/sets the <see cref="DataTemplate"/> to use for the title of an anchorable.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplate to use for the title of an anchorable."), Category("Anchorable")]
-        public DataTemplate AnchorableTitleTemplate
-        {
-            get => (DataTemplate)GetValue(AnchorableTitleTemplateProperty);
-            set => SetValue(AnchorableTitleTemplateProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="AnchorableTitleTemplate"/> property.</summary>
-        private static void OnAnchorableTitleTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorableTitleTemplateChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorableTitleTemplate"/> property.</summary>
-        protected virtual void OnAnchorableTitleTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        /// <summary>Coerces the <see cref="AnchorableTitleTemplate"/> value.</summary>
-        private static object CoerceAnchorableTitleTemplateValue(DependencyObject d, object value)
-        {
-            if (value != null && d.GetValue(AnchorableTitleTemplateSelectorProperty) != null)
-                return null;
-            return value;
-        }
-
-        #endregion AnchorableTitleTemplate
-
-        #region AnchorableTitleTemplateSelector
-
-        /// <summary><see cref="AnchorableTitleTemplateSelector"/> dependency property.</summary>
-        public static readonly DependencyProperty AnchorableTitleTemplateSelectorProperty = DependencyProperty.Register(nameof(AnchorableTitleTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnAnchorableTitleTemplateSelectorChanged));
-
-        /// <summary>Gets/sets the <see cref="DataTemplateSelector"/> to use when selecting a <see cref="DataTemplate"/> for the title of an anchorable.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplateSelector to use when selecting a DataTemplate for the title of an anchorable."), Category("Anchorable")]
-        public DataTemplateSelector AnchorableTitleTemplateSelector
-        {
-            get => (DataTemplateSelector)GetValue(AnchorableTitleTemplateSelectorProperty);
-            set => SetValue(AnchorableTitleTemplateSelectorProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="AnchorableTitleTemplateSelector"/> property.</summary>
-        private static void OnAnchorableTitleTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorableTitleTemplateSelectorChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorableTitleTemplateSelector"/> property.</summary>
-        protected virtual void OnAnchorableTitleTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue != null && AnchorableTitleTemplate != null)
-                AnchorableTitleTemplate = null;
-        }
-
-        #endregion AnchorableTitleTemplateSelector
-
-        #region AnchorableHeaderTemplate
-
-        /// <summary><see cref="AnchorableHeaderTemplate"/> dependency property.</summary>
-        public static readonly DependencyProperty AnchorableHeaderTemplateProperty = DependencyProperty.Register(nameof(AnchorableHeaderTemplate), typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnAnchorableHeaderTemplateChanged, CoerceAnchorableHeaderTemplateValue));
-
-        /// <summary>Gets/sets the <see cref="DataTemplate"/> to use for a header of an anchorable.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplate to use for a header of an anchorable"), Category("Anchorable")]
-        public DataTemplate AnchorableHeaderTemplate
-        {
-            get => (DataTemplate)GetValue(AnchorableHeaderTemplateProperty);
-            set => SetValue(AnchorableHeaderTemplateProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="AnchorableHeaderTemplate"/> property.</summary>
-        private static void OnAnchorableHeaderTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorableHeaderTemplateChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorableHeaderTemplate"/> property.</summary>
-        protected virtual void OnAnchorableHeaderTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        /// <summary>Coerces the <see cref="AnchorableHeaderTemplate"/> value.</summary>
-        private static object CoerceAnchorableHeaderTemplateValue(DependencyObject d, object value)
-        {
-            if (value != null && d.GetValue(AnchorableHeaderTemplateSelectorProperty) != null)
-                return null;
-            return value;
-        }
-
-        #endregion AnchorableHeaderTemplate
-
-        #region AnchorableHeaderTemplateSelector
-
-        /// <summary><see cref="AnchorableHeaderTemplateSelector"/> dependency property.</summary>
-        public static readonly DependencyProperty AnchorableHeaderTemplateSelectorProperty = DependencyProperty.Register(nameof(AnchorableHeaderTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplateSelector)null, OnAnchorableHeaderTemplateSelectorChanged));
-
-        /// <summary>Gets/sets the <see cref="DataTemplateSelector"/> to use for selecting the <see cref="DataTemplate"/> for the header of an anchorable.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplateSelector to use for selecting the DataTemplate for the header of an anchorable."), Category("Anchorable")]
-        public DataTemplateSelector AnchorableHeaderTemplateSelector
-        {
-            get => (DataTemplateSelector)GetValue(AnchorableHeaderTemplateSelectorProperty);
-            set => SetValue(AnchorableHeaderTemplateSelectorProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="AnchorableHeaderTemplateSelector"/> property.</summary>
-        private static void OnAnchorableHeaderTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorableHeaderTemplateSelectorChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorableHeaderTemplateSelector"/> property.</summary>
-        protected virtual void OnAnchorableHeaderTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue != null)
-                AnchorableHeaderTemplate = null;
-        }
-
-        #endregion AnchorableHeaderTemplateSelector
-
-        #region LayoutRootPanel
-
-        /// <summary><see cref="LayoutRootPanel"/> dependency property.</summary>
-        public static readonly DependencyProperty LayoutRootPanelProperty = DependencyProperty.Register(nameof(LayoutRootPanel), typeof(LayoutPanelControl), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnLayoutRootPanelChanged));
-
-        /// <summary>Gets/sets the layout <see cref="LayoutPanelControl"/> which is attached to the Layout.Root property.</summary>
-        [Bindable(true), Description("Gets/sets the layout LayoutPanelControl which is attached to the Layout.Root property."), Category("Layout")]
-        public LayoutPanelControl LayoutRootPanel
-        {
-            get => (LayoutPanelControl)GetValue(LayoutRootPanelProperty);
-            set => SetValue(LayoutRootPanelProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="LayoutRootPanel"/> property.</summary>
-        private static void OnLayoutRootPanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLayoutRootPanelChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="LayoutRootPanel"/> property.</summary>
-        protected virtual void OnLayoutRootPanelChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue != null)
-                InternalRemoveLogicalChild(e.OldValue);
-            if (e.NewValue != null)
-                InternalAddLogicalChild(e.NewValue);
-        }
-
-        #endregion LayoutRootPanel
-
-        #region RightSidePanel
-
-        /// <summary><see cref="RightSidePanel"/> dependency property.</summary>
-        public static readonly DependencyProperty RightSidePanelProperty = DependencyProperty.Register(nameof(RightSidePanel), typeof(LayoutAnchorSideControl), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnRightSidePanelChanged));
-
-        /// <summary>Gets/sets the <see cref="LayoutAnchorSideControl"/> that is displayed as right side panel control.</summary>
-        [Bindable(true), Description("Gets/sets the LayoutAnchorSideControl that is displayed as right side panel control."), Category("Side Panel")]
-        public LayoutAnchorSideControl RightSidePanel
-        {
-            get => (LayoutAnchorSideControl)GetValue(RightSidePanelProperty);
-            set => SetValue(RightSidePanelProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="RightSidePanel"/> property.</summary>
-        private static void OnRightSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnRightSidePanelChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="RightSidePanel"/> property.</summary>
-        protected virtual void OnRightSidePanelChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue != null)
-                InternalRemoveLogicalChild(e.OldValue);
-            if (e.NewValue != null)
-                InternalAddLogicalChild(e.NewValue);
-        }
-
-        #endregion RightSidePanel
-
-        #region LeftSidePanel
-
-        /// <summary><see cref="LeftSidePanel"/> dependency property.</summary>
-        public static readonly DependencyProperty LeftSidePanelProperty = DependencyProperty.Register(nameof(LeftSidePanel), typeof(LayoutAnchorSideControl), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnLeftSidePanelChanged));
-
-        /// <summary>Gets/sets the <see cref="LayoutAnchorSideControl"/> that is displayed as left side panel control.</summary>
-        [Bindable(true), Description("Gets/sets the LayoutAnchorSideControl that is displayed as left side panel control."), Category("Side Panel")]
-        public LayoutAnchorSideControl LeftSidePanel
-        {
-            get => (LayoutAnchorSideControl)GetValue(LeftSidePanelProperty);
-            set => SetValue(LeftSidePanelProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="LeftSidePanel"/> property.</summary>
-        private static void OnLeftSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLeftSidePanelChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="LeftSidePanel"/> property.</summary>
-        protected virtual void OnLeftSidePanelChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue != null)
-                InternalRemoveLogicalChild(e.OldValue);
-            if (e.NewValue != null)
-                InternalAddLogicalChild(e.NewValue);
-        }
-
-        #endregion LeftSidePanel
-
-        #region TopSidePanel
-
-        /// <summary><see cref="TopSidePanel"/> dependency property.</summary>
-        public static readonly DependencyProperty TopSidePanelProperty = DependencyProperty.Register(nameof(TopSidePanel), typeof(LayoutAnchorSideControl), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnTopSidePanelChanged));
-
-        /// <summary>Gets/sets the <see cref="LayoutAnchorSideControl"/> that is displayed as top side panel control.</summary>
-        [Bindable(true), Description("Gets/sets the LayoutAnchorSideControl that is displayed as top side panel control."), Category("Side Panel")]
-        public LayoutAnchorSideControl TopSidePanel
-        {
-            get => (LayoutAnchorSideControl)GetValue(TopSidePanelProperty);
-            set => SetValue(TopSidePanelProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="TopSidePanel"/> property.</summary>
-        private static void OnTopSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnTopSidePanelChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="TopSidePanel"/> property.</summary>
-        protected virtual void OnTopSidePanelChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue != null)
-                InternalRemoveLogicalChild(e.OldValue);
-            if (e.NewValue != null)
-                InternalAddLogicalChild(e.NewValue);
-        }
-
-        #endregion TopSidePanel
-
-        #region BottomSidePanel
-
-        /// <summary><see cref="BottomSidePanel"/> dependency property. </summary>
-        public static readonly DependencyProperty BottomSidePanelProperty = DependencyProperty.Register(nameof(BottomSidePanel), typeof(LayoutAnchorSideControl), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnBottomSidePanelChanged));
-
-        /// <summary>Gets/sets the <see cref="LayoutAnchorSideControl"/> that is displayed as bottom side panel control.</summary>
-        [Bindable(true), Description("Gets/sets the LayoutAnchorSideControl that is displayed as bottom side panel control."), Category("Side Panel")]
-        public LayoutAnchorSideControl BottomSidePanel
-        {
-            get => (LayoutAnchorSideControl)GetValue(BottomSidePanelProperty);
-            set => SetValue(BottomSidePanelProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="BottomSidePanel"/> property.</summary>
-        private static void OnBottomSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnBottomSidePanelChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="BottomSidePanel"/> property.</summary>
-        protected virtual void OnBottomSidePanelChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue != null)
-                InternalRemoveLogicalChild(e.OldValue);
-            if (e.NewValue != null)
-                InternalAddLogicalChild(e.NewValue);
-        }
-
-        #endregion BottomSidePanel
-
-        #region AutoHideWindow
-
-        /// <summary><see cref="AutoHideWindow"/> Read-Only dependency property.</summary>
-        private static readonly DependencyPropertyKey AutoHideWindowPropertyKey = DependencyProperty.RegisterReadOnly(nameof(AutoHideWindow), typeof(LayoutAutoHideWindowControl), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnAutoHideWindowChanged));
-
-        public static readonly DependencyProperty AutoHideWindowProperty = AutoHideWindowPropertyKey.DependencyProperty;
-
-        /// <summary>Gets the <see cref="LayoutAutoHideWindowControl"/> that is currently shown as autohide window.</summary>
-        [Bindable(true), Description("Gets the LayoutAutoHideWindowControl that is currently shown as autohide window."), Category("AutoHideWindow")]
-        public LayoutAutoHideWindowControl AutoHideWindow => (LayoutAutoHideWindowControl)GetValue(AutoHideWindowProperty);
-
-        /// <summary>
-        /// Provides a secure method for setting the <see cref="AutoHideWindow"/> property.  
-        /// This dependency property indicates the currently shown autohide window.
-        /// </summary>
-        /// <param name="value">The new value for the property.</param>
-        protected void SetAutoHideWindow(LayoutAutoHideWindowControl value) => SetValue(AutoHideWindowPropertyKey, value);
-
-        /// <summary>Handles changes to the <see cref="AutoHideWindow"/> property.</summary>
-        private static void OnAutoHideWindowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAutoHideWindowChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AutoHideWindow"/> property.</summary>
-        protected virtual void OnAutoHideWindowChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue != null)
-                InternalRemoveLogicalChild(e.OldValue);
-            if (e.NewValue != null)
-                InternalAddLogicalChild(e.NewValue);
-        }
-
-        #endregion AutoHideWindow
+		#region Events
+
+		/// <summary>Event fired when <see cref="DockingManager.Layout"/> property changes.</summary>
+		/// <seealso cref="Layout"/>
+		public event EventHandler LayoutChanged;
+
+		/// <summary>Event fired when <see cref="DockingManager.Layout"/> property is about to be changed.</summary>
+		/// <seealso cref="Layout"/>
+		public event EventHandler LayoutChanging;
+
+		/// <summary>Event fired when a document is about to be closed.</summary>
+		/// <remarks>Subscribers have the opportunity to cancel the operation.</remarks>
+		public event EventHandler<DocumentClosingEventArgs> DocumentClosing;
+
+		/// <summary>Event fired after a document is closed.</summary>
+		public event EventHandler<DocumentClosedEventArgs> DocumentClosed;
+
+		/// <summary>Event is raised when <see cref="ActiveContent"/> changes.</summary>
+		/// <seealso cref="ActiveContent"/>
+		public event EventHandler ActiveContentChanged;
+
+		#endregion Events
+
+		#region Public Properties
+
+		#region Layout
+
+		/// <summary><see cref="Layout"/> dependency property.</summary>
+		public static readonly DependencyProperty LayoutProperty = DependencyProperty.Register(nameof(Layout), typeof(LayoutRoot), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnLayoutChanged, CoerceLayoutValue));
+
+		/// <summary>Gets/sets the layout root of the layout tree managed in this framework.</summary>
+		[Bindable(true), Description("Gets/sets the layout root of the layout tree managed in this framework."), Category("Layout")]
+		public LayoutRoot Layout
+		{
+			get => (LayoutRoot)GetValue(LayoutProperty);
+			set => SetValue(LayoutProperty, value);
+		}
+
+		/// <summary>Coerces the <see cref="Layout"/> value.</summary>
+		private static object CoerceLayoutValue(DependencyObject d, object value)
+		{
+			if (value == null) return new LayoutRoot { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) };
+			((DockingManager)d).OnLayoutChanging(value as LayoutRoot);
+			return value;
+		}
+
+		/// <summary>Handles changes to the <see cref="Layout"/> property.</summary>
+		private static void OnLayoutChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLayoutChanged(e.OldValue as LayoutRoot, e.NewValue as LayoutRoot);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="Layout"/> property.</summary>
+		protected virtual void OnLayoutChanged(LayoutRoot oldLayout, LayoutRoot newLayout)
+		{
+			if (oldLayout != null)
+			{
+				oldLayout.PropertyChanged -= OnLayoutRootPropertyChanged;
+				oldLayout.Updated -= OnLayoutRootUpdated;
+			}
+
+			foreach (var fwc in _fwList.ToArray())
+			{
+				fwc.KeepContentVisibleOnClose = true;
+				fwc.InternalClose();
+			}
+
+			_fwList.Clear();
+
+			foreach (var fwc in _fwHiddenList.ToArray())
+			{
+				fwc.InternalClose();
+			}
+
+			_fwHiddenList.Clear();
+			DetachDocumentsSource(oldLayout, DocumentsSource);
+			DetachAnchorablesSource(oldLayout, AnchorablesSource);
+
+			if (oldLayout != null && oldLayout.Manager == this)
+				oldLayout.Manager = null;
+
+			ClearLogicalChildrenList();
+			DetachLayoutItems();
+
+			Layout.Manager = this;
+
+			AttachLayoutItems();
+			AttachDocumentsSource(newLayout, DocumentsSource);
+			AttachAnchorablesSource(newLayout, AnchorablesSource);
+
+			if (IsLoaded)
+			{
+				LayoutRootPanel = CreateUIElementForModel(Layout.RootPanel) as LayoutPanelControl;
+				LeftSidePanel = CreateUIElementForModel(Layout.LeftSide) as LayoutAnchorSideControl;
+				TopSidePanel = CreateUIElementForModel(Layout.TopSide) as LayoutAnchorSideControl;
+				RightSidePanel = CreateUIElementForModel(Layout.RightSide) as LayoutAnchorSideControl;
+				BottomSidePanel = CreateUIElementForModel(Layout.BottomSide) as LayoutAnchorSideControl;
+
+				foreach (var fw in Layout.FloatingWindows.ToArray())
+					if (fw.IsValid)
+						_fwList.Add(CreateUIElementForModel(fw) as LayoutFloatingWindowControl);
+
+				foreach (var fw in _fwList.ToArray())
+				{
+					if (fw.Model is LayoutAnchorableFloatingWindow window && window.RootPanel.IsMaximized)
+					{
+						fw.WindowState = WindowState.Normal;
+						fw.Show();
+						fw.WindowState = WindowState.Maximized;
+					}
+					else
+					{
+						if (fw.Content != null || (fw.Model as LayoutAnchorableFloatingWindow)?.IsVisible == true)
+							fw.Show();
+						else
+							fw.Hide();
+					}
+
+					//fw.Owner = Window.GetWindow(this);
+					//fw.SetParentToMainWindowOf(this);
+				}
+
+				// In order to prevent resource leaks, unsubscribe from SizeChanged event for case when user call loading of Layout Settigns.
+				SizeChanged -= OnSizeChanged;
+				SizeChanged += OnSizeChanged;
+			}
+
+			if (newLayout != null)
+			{
+				newLayout.PropertyChanged += OnLayoutRootPropertyChanged;
+				newLayout.Updated += OnLayoutRootUpdated;
+			}
+
+			LayoutChanged?.Invoke(this, EventArgs.Empty);
+			//    Layout?.CollectGarbage();
+			CommandManager.InvalidateRequerySuggested();
+		}
+
+		#endregion Layout
+
+		#region LayoutUpdateStrategy
+
+		/// <summary><see cref="LayoutUpdateStrategy"/> dependency property.</summary>
+		public static readonly DependencyProperty LayoutUpdateStrategyProperty = DependencyProperty.Register(nameof(LayoutUpdateStrategy), typeof(ILayoutUpdateStrategy), typeof(DockingManager),
+				new FrameworkPropertyMetadata((ILayoutUpdateStrategy)null));
+
+		/// <summary>
+		/// Gets/sets the layout strategy class that can be to called by the framework when it needs to position a <see cref="LayoutAnchorable"/> inside an existing layout.
+		/// </summary>
+		/// <remarks>Sometimes it's impossible to automatically insert an anchorable in the layout without specifing the target parent pane.
+		/// Set this property to an object that will be asked to insert the anchorable to the desidered position.</remarks>
+		[Bindable(true), Description("Gets/sets the layout strategy class that can be to called by the framework when it needs to position a LayoutAnchorable inside an existing layout."), Category("Layout")]
+		public ILayoutUpdateStrategy LayoutUpdateStrategy
+		{
+			get => (ILayoutUpdateStrategy)GetValue(LayoutUpdateStrategyProperty);
+			set => SetValue(LayoutUpdateStrategyProperty, value);
+		}
+
+		#endregion LayoutUpdateStrategy
+
+		#region DocumentPaneTemplate
+
+		/// <summary><see cref="DocumentPaneTemplate"/> dependency property.</summary>
+		public static readonly DependencyProperty DocumentPaneTemplateProperty = DependencyProperty.Register(nameof(DocumentPaneTemplate), typeof(ControlTemplate), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnDocumentPaneTemplateChanged));
+
+		/// <summary>Gets/sets the <see cref="ControlTemplate"/> that can be used to render the <see cref="LayoutDocumentPaneControl"/>.</summary>
+		[Bindable(true), Description("Gets/sets the ControlTemplate´that can be used to render the LayoutDocumentPaneControl."), Category("Document")]
+		public ControlTemplate DocumentPaneTemplate
+		{
+			get => (ControlTemplate)GetValue(DocumentPaneTemplateProperty);
+			set => SetValue(DocumentPaneTemplateProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="DocumentPaneTemplate"/> property.</summary>
+		private static void OnDocumentPaneTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		{
+			((DockingManager)d).OnDocumentPaneTemplateChanged(e);
+		}
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentPaneTemplate"/> property.</summary>
+		protected virtual void OnDocumentPaneTemplateChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		#endregion DocumentPaneTemplate
+
+		#region AnchorablePaneTemplate
+
+		/// <summary>
+		/// <see cref="AnchorablePaneTemplate"/> dependency property
+		/// </summary>
+		public static readonly DependencyProperty AnchorablePaneTemplateProperty = DependencyProperty.Register(nameof(AnchorablePaneTemplate), typeof(ControlTemplate), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnAnchorablePaneTemplateChanged));
+
+		/// <summary>Gets/sets the <see cref="ControlTemplate"/> used to render <see cref="LayoutAnchorablePaneControl"/>.</summary>
+		[Bindable(true), Description("Gets/sets the ControlTemplate used to render LayoutAnchorablePaneControl"), Category("Anchorable")]
+		public ControlTemplate AnchorablePaneTemplate
+		{
+			get => (ControlTemplate)GetValue(AnchorablePaneTemplateProperty);
+			set => SetValue(AnchorablePaneTemplateProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="AnchorablePaneTemplate"/> property.</summary>
+		private static void OnAnchorablePaneTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorablePaneTemplateChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorablePaneTemplate"/> property.</summary>
+		protected virtual void OnAnchorablePaneTemplateChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		#endregion AnchorablePaneTemplate
+
+		#region AnchorSideTemplate
+
+		/// <summary>The <see cref="AnchorSideTemplate"/> dependency property.</summary>
+		public static readonly DependencyProperty AnchorSideTemplateProperty = DependencyProperty.Register(nameof(AnchorSideTemplate), typeof(ControlTemplate), typeof(DockingManager),
+				new FrameworkPropertyMetadata((ControlTemplate)null));
+
+		/// <summary>Gets/sets the <see cref="ControlTemplate"/> used to render <see cref="LayoutAnchorSideControl"/>.</summary>
+		[Bindable(true), Description("Gets/sets the ControlTemplate used to render LayoutAnchorSideControl."), Category("Anchor")]
+		public ControlTemplate AnchorSideTemplate
+		{
+			get => (ControlTemplate)GetValue(AnchorSideTemplateProperty);
+			set => SetValue(AnchorSideTemplateProperty, value);
+		}
+
+		#endregion AnchorSideTemplate
+
+		#region AnchorGroupTemplate
+
+		/// <summary><see cref="AnchorGroupTemplate"/> dependency property.</summary>
+		public static readonly DependencyProperty AnchorGroupTemplateProperty = DependencyProperty.Register(nameof(AnchorGroupTemplate), typeof(ControlTemplate), typeof(DockingManager),
+				new FrameworkPropertyMetadata((ControlTemplate)null));
+
+		/// <summary>Gets/sets the <see cref="ControlTemplate"/> used to render the <see cref="LayoutAnchorGroupControl"/>.</summary>
+		[Bindable(true), Description("Gets/sets the ControlTemplate used to render LayoutAnchorGroupControl."), Category("Anchor")]
+		public ControlTemplate AnchorGroupTemplate
+		{
+			get => (ControlTemplate)GetValue(AnchorGroupTemplateProperty);
+			set => SetValue(AnchorGroupTemplateProperty, value);
+		}
+
+		#endregion AnchorGroupTemplate
+
+		#region AnchorTemplate
+
+		/// <summary><see cref="AnchorTemplate"/> dependency property.</summary>
+		public static readonly DependencyProperty AnchorTemplateProperty = DependencyProperty.Register(nameof(AnchorTemplate), typeof(ControlTemplate), typeof(DockingManager),
+				new FrameworkPropertyMetadata((ControlTemplate)null));
+
+		/// <summary>Gets/sets the <see cref="ControlTemplate"/> used to render a <see cref="LayoutAnchorControl"/>.</summary>
+		[Bindable(true), Description("Gets/sets the ControlTemplate used to render a LayoutAnchorControl."), Category("Anchor")]
+		public ControlTemplate AnchorTemplate
+		{
+			get => (ControlTemplate)GetValue(AnchorTemplateProperty);
+			set => SetValue(AnchorTemplateProperty, value);
+		}
+
+		#endregion AnchorTemplate
+
+		#region DocumentPaneControlStyle
+
+		/// <summary><see cref="DocumentPaneControlStyle"/> dependency property.</summary>
+		public static readonly DependencyProperty DocumentPaneControlStyleProperty = DependencyProperty.Register(nameof(DocumentPaneControlStyle), typeof(Style), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnDocumentPaneControlStyleChanged));
+
+		/// <summary>Gets/sets the style of a <see cref="LayoutDocumentPaneControl"/>.</summary>
+		[Bindable(true), Description("Gets/sets the style of a LayoutDocumentPaneControl."), Category("Document")]
+		public Style DocumentPaneControlStyle
+		{
+			get => (Style)GetValue(DocumentPaneControlStyleProperty);
+			set => SetValue(DocumentPaneControlStyleProperty, value);
+		}
+
+		/// <summary>Handles changes to the DocumentPaneControlStyle property.</summary>
+		private static void OnDocumentPaneControlStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentPaneControlStyleChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentPaneControlStyle"/> property.</summary>
+		protected virtual void OnDocumentPaneControlStyleChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		#endregion DocumentPaneControlStyle
+
+		#region AnchorablePaneControlStyle
+
+		/// <summary><see cref="AnchorablePaneControlStyle"/> dependency property.</summary>
+		public static readonly DependencyProperty AnchorablePaneControlStyleProperty = DependencyProperty.Register(nameof(AnchorablePaneControlStyle), typeof(Style), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnAnchorablePaneControlStyleChanged));
+
+		/// <summary>Gets/sets the <see cref="Style"/> to apply to <see cref="LayoutAnchorablePaneControl"/>.</summary>
+		[Bindable(true), Description("Gets/sets the Style to apply to LayoutAnchorablePaneControl."), Category("Anchorable")]
+		public Style AnchorablePaneControlStyle
+		{
+			get => (Style)GetValue(AnchorablePaneControlStyleProperty);
+			set => SetValue(AnchorablePaneControlStyleProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="AnchorablePaneControlStyle"/> property.</summary>
+		private static void OnAnchorablePaneControlStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorablePaneControlStyleChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorablePaneControlStyle"/> property.</summary>
+		protected virtual void OnAnchorablePaneControlStyleChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		#endregion AnchorablePaneControlStyle
+
+		#region DocumentHeaderTemplate
+
+		/// <summary><see cref="DocumentHeaderTemplate"/> dependency property.</summary>
+		public static readonly DependencyProperty DocumentHeaderTemplateProperty = DependencyProperty.Register(nameof(DocumentHeaderTemplate), typeof(DataTemplate), typeof(DockingManager),
+				new FrameworkPropertyMetadata((DataTemplate)null, OnDocumentHeaderTemplateChanged, CoerceDocumentHeaderTemplateValue));
+
+		/// <summary>Gets/sets the <see cref="DataTemplate"/> to use for document headers.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplate to use for document headers."), Category("Document")]
+		public DataTemplate DocumentHeaderTemplate
+		{
+			get => (DataTemplate)GetValue(DocumentHeaderTemplateProperty);
+			set => SetValue(DocumentHeaderTemplateProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="DocumentHeaderTemplate"/> property.</summary>
+		private static void OnDocumentHeaderTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentHeaderTemplateChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentHeaderTemplate"/> property.</summary>
+		protected virtual void OnDocumentHeaderTemplateChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		/// <summary>Coerces the <see cref="DocumentHeaderTemplate"/> value.</summary>
+		private static object CoerceDocumentHeaderTemplateValue(DependencyObject d, object value)
+		{
+			if (value != null && d.GetValue(DocumentHeaderTemplateSelectorProperty) != null)
+				return null;
+			return value;
+		}
+
+		#endregion DocumentHeaderTemplate
+
+		#region DocumentHeaderTemplateSelector
+
+		/// <summary><see cref="DocumentHeaderTemplateSelector"/> dependency property.</summary>
+		public static readonly DependencyProperty DocumentHeaderTemplateSelectorProperty = DependencyProperty.Register(nameof(DocumentHeaderTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnDocumentHeaderTemplateSelectorChanged, CoerceDocumentHeaderTemplateSelectorValue));
+
+		/// <summary>Gets /sets the <see cref="DataTemplateSelector"/> that can be used for selecting a <see cref="DataTemplate"/> for a document header.</summary>
+		[Bindable(true), Description("Gets /sets the DataTemplateSelector that can be used for selecting a DataTemplates for a document header."), Category("Document")]
+		public DataTemplateSelector DocumentHeaderTemplateSelector
+		{
+			get => (DataTemplateSelector)GetValue(DocumentHeaderTemplateSelectorProperty);
+			set => SetValue(DocumentHeaderTemplateSelectorProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="DocumentHeaderTemplateSelector"/> property.</summary>
+		private static void OnDocumentHeaderTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentHeaderTemplateSelectorChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentHeaderTemplateSelector"/> property.</summary>
+		protected virtual void OnDocumentHeaderTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (e.NewValue != null && DocumentHeaderTemplate != null)
+				DocumentHeaderTemplate = null;
+			if (DocumentPaneMenuItemHeaderTemplateSelector == null)
+				DocumentPaneMenuItemHeaderTemplateSelector = DocumentHeaderTemplateSelector;
+		}
+
+		/// <summary>Coerces the <see cref="DocumentHeaderTemplateSelector"/> value.</summary>
+		private static object CoerceDocumentHeaderTemplateSelectorValue(DependencyObject d, object value) => value;
+
+		#endregion DocumentHeaderTemplateSelector
+
+		#region DocumentTitleTemplate
+
+		/// <summary><see cref="DocumentTitleTemplate"/> dependency property.</summary>
+		public static readonly DependencyProperty DocumentTitleTemplateProperty = DependencyProperty.Register(nameof(DocumentTitleTemplate), typeof(DataTemplate), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnDocumentTitleTemplateChanged, CoerceDocumentTitleTemplateValue));
+
+		/// <summary>Gets/sets the <see cref="DataTemplate"/> to use for displaying the title of a document.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplate to use for displaying the title of a document."), Category("Document")]
+		public DataTemplate DocumentTitleTemplate
+		{
+			get => (DataTemplate)GetValue(DocumentTitleTemplateProperty);
+			set => SetValue(DocumentTitleTemplateProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="DocumentTitleTemplate"/> property.</summary>
+		private static void OnDocumentTitleTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentTitleTemplateChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentTitleTemplate"/> property.</summary>
+		protected virtual void OnDocumentTitleTemplateChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		/// <summary>Coerces the <see cref="DocumentTitleTemplate"/> value.</summary>
+		private static object CoerceDocumentTitleTemplateValue(DependencyObject d, object value)
+		{
+			if (value != null && d.GetValue(DocumentTitleTemplateSelectorProperty) != null)
+				return null;
+			return value;
+		}
+
+		#endregion DocumentTitleTemplate
+
+		#region DocumentTitleTemplateSelector
+
+		/// <summary><see cref="DocumentTitleTemplateSelector"/> dependency property.</summary>
+		public static readonly DependencyProperty DocumentTitleTemplateSelectorProperty = DependencyProperty.Register(nameof(DocumentTitleTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnDocumentTitleTemplateSelectorChanged, CoerceDocumentTitleTemplateSelectorValue));
+
+		/// <summary>Gets/sets the <see cref="DataTemplateSelector"/> to use for displaying the <see cref="DataTemplate"/> of a document's title.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplateSelector to use for displaying the DataTemplate of a document's title."), Category("Document")]
+		public DataTemplateSelector DocumentTitleTemplateSelector
+		{
+			get => (DataTemplateSelector)GetValue(DocumentTitleTemplateSelectorProperty);
+			set => SetValue(DocumentTitleTemplateSelectorProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="DocumentTitleTemplateSelector"/> property.</summary>
+		private static void OnDocumentTitleTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentTitleTemplateSelectorChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentTitleTemplateSelector"/> property.</summary>
+		protected virtual void OnDocumentTitleTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (e.NewValue != null)
+				DocumentTitleTemplate = null;
+		}
+
+		/// <summary>Coerces the <see cref="DocumentTitleTemplateSelector"/> value.</summary>
+		private static object CoerceDocumentTitleTemplateSelectorValue(DependencyObject d, object value) => value;
+
+		#endregion DocumentTitleTemplateSelector
+
+		#region AnchorableTitleTemplate
+
+		/// <summary><see cref="AnchorableTitleTemplate"/> dependency property.</summary>
+		public static readonly DependencyProperty AnchorableTitleTemplateProperty = DependencyProperty.Register(nameof(AnchorableTitleTemplate), typeof(DataTemplate), typeof(DockingManager),
+				new FrameworkPropertyMetadata((DataTemplate)null, OnAnchorableTitleTemplateChanged, CoerceAnchorableTitleTemplateValue));
+
+		/// <summary>Gets/sets the <see cref="DataTemplate"/> to use for the title of an anchorable.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplate to use for the title of an anchorable."), Category("Anchorable")]
+		public DataTemplate AnchorableTitleTemplate
+		{
+			get => (DataTemplate)GetValue(AnchorableTitleTemplateProperty);
+			set => SetValue(AnchorableTitleTemplateProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="AnchorableTitleTemplate"/> property.</summary>
+		private static void OnAnchorableTitleTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorableTitleTemplateChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorableTitleTemplate"/> property.</summary>
+		protected virtual void OnAnchorableTitleTemplateChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		/// <summary>Coerces the <see cref="AnchorableTitleTemplate"/> value.</summary>
+		private static object CoerceAnchorableTitleTemplateValue(DependencyObject d, object value)
+		{
+			if (value != null && d.GetValue(AnchorableTitleTemplateSelectorProperty) != null)
+				return null;
+			return value;
+		}
+
+		#endregion AnchorableTitleTemplate
+
+		#region AnchorableTitleTemplateSelector
+
+		/// <summary><see cref="AnchorableTitleTemplateSelector"/> dependency property.</summary>
+		public static readonly DependencyProperty AnchorableTitleTemplateSelectorProperty = DependencyProperty.Register(nameof(AnchorableTitleTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnAnchorableTitleTemplateSelectorChanged));
+
+		/// <summary>Gets/sets the <see cref="DataTemplateSelector"/> to use when selecting a <see cref="DataTemplate"/> for the title of an anchorable.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplateSelector to use when selecting a DataTemplate for the title of an anchorable."), Category("Anchorable")]
+		public DataTemplateSelector AnchorableTitleTemplateSelector
+		{
+			get => (DataTemplateSelector)GetValue(AnchorableTitleTemplateSelectorProperty);
+			set => SetValue(AnchorableTitleTemplateSelectorProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="AnchorableTitleTemplateSelector"/> property.</summary>
+		private static void OnAnchorableTitleTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorableTitleTemplateSelectorChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorableTitleTemplateSelector"/> property.</summary>
+		protected virtual void OnAnchorableTitleTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (e.NewValue != null && AnchorableTitleTemplate != null)
+				AnchorableTitleTemplate = null;
+		}
+
+		#endregion AnchorableTitleTemplateSelector
+
+		#region AnchorableHeaderTemplate
+
+		/// <summary><see cref="AnchorableHeaderTemplate"/> dependency property.</summary>
+		public static readonly DependencyProperty AnchorableHeaderTemplateProperty = DependencyProperty.Register(nameof(AnchorableHeaderTemplate), typeof(DataTemplate), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnAnchorableHeaderTemplateChanged, CoerceAnchorableHeaderTemplateValue));
+
+		/// <summary>Gets/sets the <see cref="DataTemplate"/> to use for a header of an anchorable.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplate to use for a header of an anchorable"), Category("Anchorable")]
+		public DataTemplate AnchorableHeaderTemplate
+		{
+			get => (DataTemplate)GetValue(AnchorableHeaderTemplateProperty);
+			set => SetValue(AnchorableHeaderTemplateProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="AnchorableHeaderTemplate"/> property.</summary>
+		private static void OnAnchorableHeaderTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorableHeaderTemplateChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorableHeaderTemplate"/> property.</summary>
+		protected virtual void OnAnchorableHeaderTemplateChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		/// <summary>Coerces the <see cref="AnchorableHeaderTemplate"/> value.</summary>
+		private static object CoerceAnchorableHeaderTemplateValue(DependencyObject d, object value)
+		{
+			if (value != null && d.GetValue(AnchorableHeaderTemplateSelectorProperty) != null)
+				return null;
+			return value;
+		}
+
+		#endregion AnchorableHeaderTemplate
+
+		#region AnchorableHeaderTemplateSelector
+
+		/// <summary><see cref="AnchorableHeaderTemplateSelector"/> dependency property.</summary>
+		public static readonly DependencyProperty AnchorableHeaderTemplateSelectorProperty = DependencyProperty.Register(nameof(AnchorableHeaderTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
+				new FrameworkPropertyMetadata((DataTemplateSelector)null, OnAnchorableHeaderTemplateSelectorChanged));
+
+		/// <summary>Gets/sets the <see cref="DataTemplateSelector"/> to use for selecting the <see cref="DataTemplate"/> for the header of an anchorable.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplateSelector to use for selecting the DataTemplate for the header of an anchorable."), Category("Anchorable")]
+		public DataTemplateSelector AnchorableHeaderTemplateSelector
+		{
+			get => (DataTemplateSelector)GetValue(AnchorableHeaderTemplateSelectorProperty);
+			set => SetValue(AnchorableHeaderTemplateSelectorProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="AnchorableHeaderTemplateSelector"/> property.</summary>
+		private static void OnAnchorableHeaderTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorableHeaderTemplateSelectorChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorableHeaderTemplateSelector"/> property.</summary>
+		protected virtual void OnAnchorableHeaderTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (e.NewValue != null)
+				AnchorableHeaderTemplate = null;
+		}
+
+		#endregion AnchorableHeaderTemplateSelector
+
+		#region LayoutRootPanel
+
+		/// <summary><see cref="LayoutRootPanel"/> dependency property.</summary>
+		public static readonly DependencyProperty LayoutRootPanelProperty = DependencyProperty.Register(nameof(LayoutRootPanel), typeof(LayoutPanelControl), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnLayoutRootPanelChanged));
+
+		/// <summary>Gets/sets the layout <see cref="LayoutPanelControl"/> which is attached to the Layout.Root property.</summary>
+		[Bindable(true), Description("Gets/sets the layout LayoutPanelControl which is attached to the Layout.Root property."), Category("Layout")]
+		public LayoutPanelControl LayoutRootPanel
+		{
+			get => (LayoutPanelControl)GetValue(LayoutRootPanelProperty);
+			set => SetValue(LayoutRootPanelProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="LayoutRootPanel"/> property.</summary>
+		private static void OnLayoutRootPanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLayoutRootPanelChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="LayoutRootPanel"/> property.</summary>
+		protected virtual void OnLayoutRootPanelChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (e.OldValue != null)
+				InternalRemoveLogicalChild(e.OldValue);
+			if (e.NewValue != null)
+				InternalAddLogicalChild(e.NewValue);
+		}
+
+		#endregion LayoutRootPanel
+
+		#region RightSidePanel
+
+		/// <summary><see cref="RightSidePanel"/> dependency property.</summary>
+		public static readonly DependencyProperty RightSidePanelProperty = DependencyProperty.Register(nameof(RightSidePanel), typeof(LayoutAnchorSideControl), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnRightSidePanelChanged));
+
+		/// <summary>Gets/sets the <see cref="LayoutAnchorSideControl"/> that is displayed as right side panel control.</summary>
+		[Bindable(true), Description("Gets/sets the LayoutAnchorSideControl that is displayed as right side panel control."), Category("Side Panel")]
+		public LayoutAnchorSideControl RightSidePanel
+		{
+			get => (LayoutAnchorSideControl)GetValue(RightSidePanelProperty);
+			set => SetValue(RightSidePanelProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="RightSidePanel"/> property.</summary>
+		private static void OnRightSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnRightSidePanelChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="RightSidePanel"/> property.</summary>
+		protected virtual void OnRightSidePanelChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (e.OldValue != null)
+				InternalRemoveLogicalChild(e.OldValue);
+			if (e.NewValue != null)
+				InternalAddLogicalChild(e.NewValue);
+		}
+
+		#endregion RightSidePanel
+
+		#region LeftSidePanel
+
+		/// <summary><see cref="LeftSidePanel"/> dependency property.</summary>
+		public static readonly DependencyProperty LeftSidePanelProperty = DependencyProperty.Register(nameof(LeftSidePanel), typeof(LayoutAnchorSideControl), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnLeftSidePanelChanged));
+
+		/// <summary>Gets/sets the <see cref="LayoutAnchorSideControl"/> that is displayed as left side panel control.</summary>
+		[Bindable(true), Description("Gets/sets the LayoutAnchorSideControl that is displayed as left side panel control."), Category("Side Panel")]
+		public LayoutAnchorSideControl LeftSidePanel
+		{
+			get => (LayoutAnchorSideControl)GetValue(LeftSidePanelProperty);
+			set => SetValue(LeftSidePanelProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="LeftSidePanel"/> property.</summary>
+		private static void OnLeftSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLeftSidePanelChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="LeftSidePanel"/> property.</summary>
+		protected virtual void OnLeftSidePanelChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (e.OldValue != null)
+				InternalRemoveLogicalChild(e.OldValue);
+			if (e.NewValue != null)
+				InternalAddLogicalChild(e.NewValue);
+		}
+
+		#endregion LeftSidePanel
+
+		#region TopSidePanel
+
+		/// <summary><see cref="TopSidePanel"/> dependency property.</summary>
+		public static readonly DependencyProperty TopSidePanelProperty = DependencyProperty.Register(nameof(TopSidePanel), typeof(LayoutAnchorSideControl), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnTopSidePanelChanged));
+
+		/// <summary>Gets/sets the <see cref="LayoutAnchorSideControl"/> that is displayed as top side panel control.</summary>
+		[Bindable(true), Description("Gets/sets the LayoutAnchorSideControl that is displayed as top side panel control."), Category("Side Panel")]
+		public LayoutAnchorSideControl TopSidePanel
+		{
+			get => (LayoutAnchorSideControl)GetValue(TopSidePanelProperty);
+			set => SetValue(TopSidePanelProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="TopSidePanel"/> property.</summary>
+		private static void OnTopSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnTopSidePanelChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="TopSidePanel"/> property.</summary>
+		protected virtual void OnTopSidePanelChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (e.OldValue != null)
+				InternalRemoveLogicalChild(e.OldValue);
+			if (e.NewValue != null)
+				InternalAddLogicalChild(e.NewValue);
+		}
+
+		#endregion TopSidePanel
+
+		#region BottomSidePanel
+
+		/// <summary><see cref="BottomSidePanel"/> dependency property. </summary>
+		public static readonly DependencyProperty BottomSidePanelProperty = DependencyProperty.Register(nameof(BottomSidePanel), typeof(LayoutAnchorSideControl), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnBottomSidePanelChanged));
+
+		/// <summary>Gets/sets the <see cref="LayoutAnchorSideControl"/> that is displayed as bottom side panel control.</summary>
+		[Bindable(true), Description("Gets/sets the LayoutAnchorSideControl that is displayed as bottom side panel control."), Category("Side Panel")]
+		public LayoutAnchorSideControl BottomSidePanel
+		{
+			get => (LayoutAnchorSideControl)GetValue(BottomSidePanelProperty);
+			set => SetValue(BottomSidePanelProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="BottomSidePanel"/> property.</summary>
+		private static void OnBottomSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnBottomSidePanelChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="BottomSidePanel"/> property.</summary>
+		protected virtual void OnBottomSidePanelChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (e.OldValue != null)
+				InternalRemoveLogicalChild(e.OldValue);
+			if (e.NewValue != null)
+				InternalAddLogicalChild(e.NewValue);
+		}
+
+		#endregion BottomSidePanel
+
+		#region AutoHideWindow
+
+		/// <summary><see cref="AutoHideWindow"/> Read-Only dependency property.</summary>
+		private static readonly DependencyPropertyKey AutoHideWindowPropertyKey = DependencyProperty.RegisterReadOnly(nameof(AutoHideWindow), typeof(LayoutAutoHideWindowControl), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnAutoHideWindowChanged));
+
+		public static readonly DependencyProperty AutoHideWindowProperty = AutoHideWindowPropertyKey.DependencyProperty;
+
+		/// <summary>Gets the <see cref="LayoutAutoHideWindowControl"/> that is currently shown as autohide window.</summary>
+		[Bindable(true), Description("Gets the LayoutAutoHideWindowControl that is currently shown as autohide window."), Category("AutoHideWindow")]
+		public LayoutAutoHideWindowControl AutoHideWindow => (LayoutAutoHideWindowControl)GetValue(AutoHideWindowProperty);
+
+		/// <summary>
+		/// Provides a secure method for setting the <see cref="AutoHideWindow"/> property.
+		/// This dependency property indicates the currently shown autohide window.
+		/// </summary>
+		/// <param name="value">The new value for the property.</param>
+		protected void SetAutoHideWindow(LayoutAutoHideWindowControl value) => SetValue(AutoHideWindowPropertyKey, value);
+
+		/// <summary>Handles changes to the <see cref="AutoHideWindow"/> property.</summary>
+		private static void OnAutoHideWindowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAutoHideWindowChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AutoHideWindow"/> property.</summary>
+		protected virtual void OnAutoHideWindowChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (e.OldValue != null)
+				InternalRemoveLogicalChild(e.OldValue);
+			if (e.NewValue != null)
+				InternalAddLogicalChild(e.NewValue);
+		}
+
+		#endregion AutoHideWindow
 
 		#region AutoHideDelay
+
 		/// <summary>
 		/// Implements the backing store of the <see cref="AutoHideDelay"/> dependency property.
 		/// </summary>
@@ -822,1835 +824,1821 @@ protected virtual void OnAutoHideWindowChanged(DependencyPropertyChangedEventArg
 			DependencyProperty.Register("AutoHideDelay", typeof(int), typeof(DockingManager),
 										new UIPropertyMetadata(500));
 
-        /// <summary>
-        /// Gets/sets the wait time in milliseconds that is applicable when the system AutoHides
-        /// a <see cref="LayoutAnchorableControl"/> (reduces it to a side anchor) after the user:
-        /// 
-        /// 1) clicks on a <see cref="LayoutAnchorControl "/> that is anchored in one of the <see cref="Layout"/>
-        /// property sides (top, right, left, or bottom) and
-        /// 
-        /// 2) clicks somewhere else into a focusable element (different document).
-        /// 
-        /// Expected behavior: The system waits for the configured time and reduces the <see cref="LayoutAnchorableControl"/> (into its side anchor).
-        /// Recommended configuration value range should be between 0 and 1500 milliseconds.
-        /// </summary>
-        [Bindable(true), Description("Gets/sets the wait time in milliseconds that is applicable when the system AutoHides a LayoutAnchorableControl (reduces it to a side anchor)."), Category("AutoHideWindow")]
-        public int AutoHideDelay
-        {
-            get => (int)GetValue(AutoHideDelayProperty);
-            set => SetValue(AutoHideDelayProperty, value);
-        }
-        #endregion AutoHideDelay
-
-        /// <summary>Enumerates all <see cref="LayoutFloatingWindowControl"/>s managed by this framework.</summary>
-        [Bindable(false), Description("Enumerates all LayoutFloatingWindowControls managed by this framework."), Category("FloatingWindow")]
-        public IEnumerable<LayoutFloatingWindowControl> FloatingWindows => _fwList;
-
-        #region LayoutItemTemplate
-
-        /// <summary><see cref="LayoutItemTemplate"/> dependency property.</summary>
-        public static readonly DependencyProperty LayoutItemTemplateProperty = DependencyProperty.Register(nameof(LayoutItemTemplate), typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplate)null, OnLayoutItemTemplateChanged));
-
-        /// <summary>Gets/sets the <see cref="DataTemplate"/> used to render anchorable and document content.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplate used to render anchorable and document content."), Category("Layout")]
-        public DataTemplate LayoutItemTemplate
-        {
-            get => (DataTemplate)GetValue(LayoutItemTemplateProperty);
-            set => SetValue(LayoutItemTemplateProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="LayoutItemTemplate"/> property.</summary>
-        private static void OnLayoutItemTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLayoutItemTemplateChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="LayoutItemTemplate"/> property.</summary>
-        protected virtual void OnLayoutItemTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        #endregion LayoutItemTemplate
-
-        #region LayoutItemTemplateSelector
-
-        /// <summary><see cref="LayoutItemTemplateSelector"/> dependency property.</summary>
-        public static readonly DependencyProperty LayoutItemTemplateSelectorProperty = DependencyProperty.Register(nameof(LayoutItemTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnLayoutItemTemplateSelectorChanged));
-
-        /// <summary>Gets/sets the <see cref="DataTemplateSelector"/> to select a <see cref="DataTemplate"/> of an anchorable.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplateSelector to select a DataTemplate of an anchorable."), Category("Layout")]
-        public DataTemplateSelector LayoutItemTemplateSelector
-        {
-            get => (DataTemplateSelector)GetValue(LayoutItemTemplateSelectorProperty);
-            set => SetValue(LayoutItemTemplateSelectorProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="LayoutItemTemplateSelector"/> property.</summary>
-        private static void OnLayoutItemTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLayoutItemTemplateSelectorChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="LayoutItemTemplateSelector"/> property.</summary>
-        protected virtual void OnLayoutItemTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        #endregion LayoutItemTemplateSelector
-
-        #region DocumentsSource
-
-        /// <summary><see cref="DocumentsSource"/> dependency property.</summary>
-        public static readonly DependencyProperty DocumentsSourceProperty = DependencyProperty.Register(nameof(DocumentsSource), typeof(IEnumerable), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnDocumentsSourceChanged));
-
-        /// <summary>Gets/sets the source collection of <see cref="LayoutDocument"/> objects.</summary>
-        [Bindable(true), Description("Gets/sets the source collection of LayoutDocument objects."), Category("Document")]
-        public IEnumerable DocumentsSource
-        {
-            get => (IEnumerable)GetValue(DocumentsSourceProperty);
-            set => SetValue(DocumentsSourceProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="DocumentsSource"/> property.</summary>
-        private static void OnDocumentsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentsSourceChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentsSource"/> property.</summary>
-        protected virtual void OnDocumentsSourceChanged(DependencyPropertyChangedEventArgs e)
-        {
-            DetachDocumentsSource(Layout, e.OldValue as IEnumerable);
-            AttachDocumentsSource(Layout, e.NewValue as IEnumerable);
-        }
-
-        #endregion DocumentsSource
-
-        #region DocumentContextMenu
-
-        /// <summary><see cref="DocumentContextMenu"/> dependency property.</summary>
-        public static readonly DependencyProperty DocumentContextMenuProperty = DependencyProperty.Register(nameof(DocumentContextMenu), typeof(ContextMenu), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ContextMenu)null, OnContextMenuPropertyChanged));
-
-        /// <summary>Gets/sets the <see cref="ContextMenu"/> to show for a document.</summary>
-        [Bindable(true), Description("Gets/sets the ContextMenu to show for a document."), Category("Document")]
-        public ContextMenu DocumentContextMenu
-        {
-            get => (ContextMenu)GetValue(DocumentContextMenuProperty);
-            set => SetValue(DocumentContextMenuProperty, value);
-        }
-
-        #endregion DocumentContextMenu
-
-        #region AnchorablesSource
-
-        /// <summary><see cref="AnchorablesSource"/> dependency property.</summary>
-        public static readonly DependencyProperty AnchorablesSourceProperty = DependencyProperty.Register(nameof(AnchorablesSource), typeof(IEnumerable), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnAnchorablesSourceChanged));
-
-        /// <summary>Gets/sets the source collection for all <see cref="LayoutAnchorable"/> objects managed in this framework.</summary>
-        [Bindable(true), Description("Gets/sets the source collection for all LayoutAnchorable objects managed in this framework."), Category("Anchorable")]
-        public IEnumerable AnchorablesSource
-        {
-            get => (IEnumerable)GetValue(AnchorablesSourceProperty);
-            set => SetValue(AnchorablesSourceProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="AnchorablesSource"/> property.</summary>
-        private static void OnAnchorablesSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorablesSourceChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorablesSource"/> property.</summary>
-        protected virtual void OnAnchorablesSourceChanged(DependencyPropertyChangedEventArgs e)
-        {
-            DetachAnchorablesSource(Layout, e.OldValue as IEnumerable);
-            AttachAnchorablesSource(Layout, e.NewValue as IEnumerable);
-        }
-
-        #endregion AnchorablesSource
-
-        #region ActiveContent
-
-        /// <summary><see cref="ActiveContent"/> dependency property.</summary>
-        public static readonly DependencyProperty ActiveContentProperty = DependencyProperty.Register(nameof(ActiveContent), typeof(object), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnActiveContentChanged));
-
-        /// <summary>Gets/sets the content that is currently active (document,anchoreable, or null).</summary>
-        [Bindable(true), Description("Gets/sets the content that is currently active (document,anchoreable, or null)."), Category("Other")]
-        public object ActiveContent
-        {
-            get => (object)GetValue(ActiveContentProperty);
-            set => SetValue(ActiveContentProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="ActiveContent"/> property.</summary>
-        private static void OnActiveContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((DockingManager)d).InternalSetActiveContent(e.NewValue);
-            ((DockingManager)d).OnActiveContentChanged(e);
-        }
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="ActiveContent"/> property.</summary>
-        protected virtual void OnActiveContentChanged(DependencyPropertyChangedEventArgs e) => ActiveContentChanged?.Invoke(this, EventArgs.Empty);
-
-        #endregion ActiveContent
-
-        #region AnchorableContextMenu
-
-        /// <summary><see cref="AnchorableContextMenu"/> dependency property.</summary>
-        public static readonly DependencyProperty AnchorableContextMenuProperty = DependencyProperty.Register(nameof(AnchorableContextMenu), typeof(ContextMenu), typeof(DockingManager),
-                new FrameworkPropertyMetadata((ContextMenu)null, OnContextMenuPropertyChanged));
-
-        /// <summary>Gets/sets the <see cref="ContextMenu"/> to show on an anchorable.</summary>
-        [Bindable(true), Description("Gets/sets the ContextMenu to show on an anchorable."), Category("Anchorable")]
-        public ContextMenu AnchorableContextMenu
-        {
-            get => (ContextMenu)GetValue(AnchorableContextMenuProperty);
-            set => SetValue(AnchorableContextMenuProperty, value);
-        }
-
-        #endregion AnchorableContextMenu
-
-        #region Theme
-
-        /// <summary><see cref="Theme"/> dependency property.</summary>
-        public static readonly DependencyProperty ThemeProperty = DependencyProperty.Register(nameof(Theme), typeof(Theme), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnThemeChanged));
-
-        /// <summary>Gets/sets the <see cref="Theme"/> to be used for the controls in this framework.</summary>
-        [Bindable(true), Description("Gets/sets the Theme to be used for the controls in this framework."), Category("Other")]
-        public Theme Theme
-        {
-            get => (Theme)GetValue(ThemeProperty);
-            set => SetValue(ThemeProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="Theme"/> property.</summary>
-        private static void OnThemeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnThemeChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="Theme"/> property.</summary>
-        protected virtual void OnThemeChanged(DependencyPropertyChangedEventArgs e)
-        {
-            var oldTheme = e.OldValue as Theme;
-            var resources = Resources;
-            if (oldTheme != null)
-            {
-                if (oldTheme is DictionaryTheme)
-                {
-                    if (currentThemeResourceDictionary != null)
-                    {
-                        resources.MergedDictionaries.Remove(currentThemeResourceDictionary);
-                        currentThemeResourceDictionary = null;
-                    }
-                }
-                else
-                {
-                    var resourceDictionaryToRemove =
-                        resources.MergedDictionaries.FirstOrDefault(r => r.Source == oldTheme.GetResourceUri());
-                    if (resourceDictionaryToRemove != null)
-                        resources.MergedDictionaries.Remove(
-                            resourceDictionaryToRemove);
-                }
-            }
-
-            if (e.NewValue as Theme != null)
-            {
-                if (e.NewValue as Theme is DictionaryTheme theme)
-                {
-                    currentThemeResourceDictionary = theme.ThemeResourceDictionary;
-                    resources.MergedDictionaries.Add(currentThemeResourceDictionary);
-                }
-                else
-                    resources.MergedDictionaries.Add(new ResourceDictionary { Source = (e.NewValue as Theme).GetResourceUri() });
-            }
-
-            foreach (var fwc in _fwList)
-                fwc.UpdateThemeResources(oldTheme);
-
-            _navigatorWindow?.UpdateThemeResources();
-            _overlayWindow?.UpdateThemeResources();
-        }
-
-        #endregion Theme
-
-        #region GridSplitterWidth
-
-        /// <summary><see cref="GridSplitterWidth"/> dependency property.</summary>
-        public static readonly DependencyProperty GridSplitterWidthProperty = DependencyProperty.Register(nameof(GridSplitterWidth), typeof(double), typeof(DockingManager),
-                new FrameworkPropertyMetadata(6.0));
-
-        /// <summary>Gets/sets the width of a grid splitter.</summary>
-        [Bindable(true), Description("Gets/sets the width of a grid splitter"), Category("Other")]
-        public double GridSplitterWidth
-        {
-            get => (double)GetValue(GridSplitterWidthProperty);
-            set => SetValue(GridSplitterWidthProperty, value);
-        }
-
-        #endregion GridSplitterWidth
-
-        #region GridSplitterHeight
-
-        /// <summary><see cref="GridSplitterHeight"/> dependency property.</summary>
-        public static readonly DependencyProperty GridSplitterHeightProperty = DependencyProperty.Register(nameof(GridSplitterHeight), typeof(double), typeof(DockingManager),
-                new FrameworkPropertyMetadata(6.0));
-
-        /// <summary>Gets/sets the height of a grid splitter.</summary>
-        [Bindable(true), Description("Gets/sets the height of a grid splitter"), Category("Other")]
-        public double GridSplitterHeight
-        {
-            get => (double)GetValue(GridSplitterHeightProperty);
-            set => SetValue(GridSplitterHeightProperty, value);
-        }
-
-        #endregion GridSplitterHeight
-
-        #region DocumentPaneMenuItemHeaderTemplate
-
-        /// <summary><see cref="DocumentPaneMenuItemHeaderTemplate"/> dependency property.</summary>
-        public static readonly DependencyProperty DocumentPaneMenuItemHeaderTemplateProperty = DependencyProperty.Register(nameof(DocumentPaneMenuItemHeaderTemplate), typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnDocumentPaneMenuItemHeaderTemplateChanged, CoerceDocumentPaneMenuItemHeaderTemplateValue));
-
-        /// <summary>Gets/sets the <see cref="DataTemplate"/> for the header to display menu dropdown items on a document pane.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplate for the header to display menu dropdown items on a document pane."), Category("Other")]
-        public DataTemplate DocumentPaneMenuItemHeaderTemplate
-        {
-            get => (DataTemplate)GetValue(DocumentPaneMenuItemHeaderTemplateProperty);
-            set => SetValue(DocumentPaneMenuItemHeaderTemplateProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="DocumentPaneMenuItemHeaderTemplate"/> property.</summary>
-        private static void OnDocumentPaneMenuItemHeaderTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentPaneMenuItemHeaderTemplateChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentPaneMenuItemHeaderTemplate"/> property.</summary>
-        protected virtual void OnDocumentPaneMenuItemHeaderTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        /// <summary>Coerces the <see cref="DocumentPaneMenuItemHeaderTemplate"/> value.</summary>
-        private static object CoerceDocumentPaneMenuItemHeaderTemplateValue(DependencyObject d, object value)
-        {
-            if (value != null && d.GetValue(DocumentPaneMenuItemHeaderTemplateSelectorProperty) != null)
-                return null;
-            return value ?? d.GetValue(DocumentHeaderTemplateProperty);
-        }
-
-        #endregion DocumentPaneMenuItemHeaderTemplate
-
-        #region DocumentPaneMenuItemHeaderTemplateSelector
-
-        /// <summary><see cref="DocumentPaneMenuItemHeaderTemplateSelector"/> dependency property.</summary>
-        public static readonly DependencyProperty DocumentPaneMenuItemHeaderTemplateSelectorProperty = DependencyProperty.Register(nameof(DocumentPaneMenuItemHeaderTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnDocumentPaneMenuItemHeaderTemplateSelectorChanged, CoerceDocumentPaneMenuItemHeaderTemplateSelectorValue));
-
-        /// <summary>Gets/sets the <see cref="DataTemplateSelector"/> to select a <see cref="DataTemplate"/> for the menu items shown when user selects the <see cref="LayoutDocumentPaneControl"/> context menu switch.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplateSelector to select a DataTemplate for the menu items shown when user selects the LayoutDocumentPaneControl context menu switch."), Category("Document")]
-        public DataTemplateSelector DocumentPaneMenuItemHeaderTemplateSelector
-        {
-            get => (DataTemplateSelector)GetValue(DocumentPaneMenuItemHeaderTemplateSelectorProperty);
-            set => SetValue(DocumentPaneMenuItemHeaderTemplateSelectorProperty, value);
-        }
-
-        /// <summary>Handles changes to the <see cref="DocumentPaneMenuItemHeaderTemplateSelector"/> property.</summary>
-        private static void OnDocumentPaneMenuItemHeaderTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentPaneMenuItemHeaderTemplateSelectorChanged(e);
-
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentPaneMenuItemHeaderTemplateSelector"/> property.</summary>
-        protected virtual void OnDocumentPaneMenuItemHeaderTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue != null && DocumentPaneMenuItemHeaderTemplate != null)
-                DocumentPaneMenuItemHeaderTemplate = null;
-        }
+		/// <summary>
+		/// Gets/sets the wait time in milliseconds that is applicable when the system AutoHides
+		/// a <see cref="LayoutAnchorableControl"/> (reduces it to a side anchor) after the user:
+		///
+		/// 1) clicks on a <see cref="LayoutAnchorControl "/> that is anchored in one of the <see cref="Layout"/>
+		/// property sides (top, right, left, or bottom) and
+		///
+		/// 2) clicks somewhere else into a focusable element (different document).
+		///
+		/// Expected behavior: The system waits for the configured time and reduces the <see cref="LayoutAnchorableControl"/> (into its side anchor).
+		/// Recommended configuration value range should be between 0 and 1500 milliseconds.
+		/// </summary>
+		[Bindable(true), Description("Gets/sets the wait time in milliseconds that is applicable when the system AutoHides a LayoutAnchorableControl (reduces it to a side anchor)."), Category("AutoHideWindow")]
+		public int AutoHideDelay
+		{
+			get => (int)GetValue(AutoHideDelayProperty);
+			set => SetValue(AutoHideDelayProperty, value);
+		}
 
-        /// <summary>Coerces the <see cref="DocumentPaneMenuItemHeaderTemplateSelector"/> value.</summary>
-        private static object CoerceDocumentPaneMenuItemHeaderTemplateSelectorValue(DependencyObject d, object value) => value;
+		#endregion AutoHideDelay
 
-        #endregion DocumentPaneMenuItemHeaderTemplateSelector
+		/// <summary>Enumerates all <see cref="LayoutFloatingWindowControl"/>s managed by this framework.</summary>
+		[Bindable(false), Description("Enumerates all LayoutFloatingWindowControls managed by this framework."), Category("FloatingWindow")]
+		public IEnumerable<LayoutFloatingWindowControl> FloatingWindows => _fwList;
+
+		#region LayoutItemTemplate
+
+		/// <summary><see cref="LayoutItemTemplate"/> dependency property.</summary>
+		public static readonly DependencyProperty LayoutItemTemplateProperty = DependencyProperty.Register(nameof(LayoutItemTemplate), typeof(DataTemplate), typeof(DockingManager),
+				new FrameworkPropertyMetadata((DataTemplate)null, OnLayoutItemTemplateChanged));
+
+		/// <summary>Gets/sets the <see cref="DataTemplate"/> used to render anchorable and document content.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplate used to render anchorable and document content."), Category("Layout")]
+		public DataTemplate LayoutItemTemplate
+		{
+			get => (DataTemplate)GetValue(LayoutItemTemplateProperty);
+			set => SetValue(LayoutItemTemplateProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="LayoutItemTemplate"/> property.</summary>
+		private static void OnLayoutItemTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLayoutItemTemplateChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="LayoutItemTemplate"/> property.</summary>
+		protected virtual void OnLayoutItemTemplateChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
 
-        #region IconContentTemplate
+		#endregion LayoutItemTemplate
+
+		#region LayoutItemTemplateSelector
+
+		/// <summary><see cref="LayoutItemTemplateSelector"/> dependency property.</summary>
+		public static readonly DependencyProperty LayoutItemTemplateSelectorProperty = DependencyProperty.Register(nameof(LayoutItemTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnLayoutItemTemplateSelectorChanged));
+
+		/// <summary>Gets/sets the <see cref="DataTemplateSelector"/> to select a <see cref="DataTemplate"/> of an anchorable.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplateSelector to select a DataTemplate of an anchorable."), Category("Layout")]
+		public DataTemplateSelector LayoutItemTemplateSelector
+		{
+			get => (DataTemplateSelector)GetValue(LayoutItemTemplateSelectorProperty);
+			set => SetValue(LayoutItemTemplateSelectorProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="LayoutItemTemplateSelector"/> property.</summary>
+		private static void OnLayoutItemTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLayoutItemTemplateSelectorChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="LayoutItemTemplateSelector"/> property.</summary>
+		protected virtual void OnLayoutItemTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		#endregion LayoutItemTemplateSelector
+
+		#region DocumentsSource
+
+		/// <summary><see cref="DocumentsSource"/> dependency property.</summary>
+		public static readonly DependencyProperty DocumentsSourceProperty = DependencyProperty.Register(nameof(DocumentsSource), typeof(IEnumerable), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnDocumentsSourceChanged));
+
+		/// <summary>Gets/sets the source collection of <see cref="LayoutDocument"/> objects.</summary>
+		[Bindable(true), Description("Gets/sets the source collection of LayoutDocument objects."), Category("Document")]
+		public IEnumerable DocumentsSource
+		{
+			get => (IEnumerable)GetValue(DocumentsSourceProperty);
+			set => SetValue(DocumentsSourceProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="DocumentsSource"/> property.</summary>
+		private static void OnDocumentsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentsSourceChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentsSource"/> property.</summary>
+		protected virtual void OnDocumentsSourceChanged(DependencyPropertyChangedEventArgs e)
+		{
+			DetachDocumentsSource(Layout, e.OldValue as IEnumerable);
+			AttachDocumentsSource(Layout, e.NewValue as IEnumerable);
+		}
+
+		#endregion DocumentsSource
+
+		#region DocumentContextMenu
+
+		/// <summary><see cref="DocumentContextMenu"/> dependency property.</summary>
+		public static readonly DependencyProperty DocumentContextMenuProperty = DependencyProperty.Register(nameof(DocumentContextMenu), typeof(ContextMenu), typeof(DockingManager),
+				new FrameworkPropertyMetadata((ContextMenu)null, OnContextMenuPropertyChanged));
+
+		/// <summary>Gets/sets the <see cref="ContextMenu"/> to show for a document.</summary>
+		[Bindable(true), Description("Gets/sets the ContextMenu to show for a document."), Category("Document")]
+		public ContextMenu DocumentContextMenu
+		{
+			get => (ContextMenu)GetValue(DocumentContextMenuProperty);
+			set => SetValue(DocumentContextMenuProperty, value);
+		}
+
+		#endregion DocumentContextMenu
+
+		#region AnchorablesSource
+
+		/// <summary><see cref="AnchorablesSource"/> dependency property.</summary>
+		public static readonly DependencyProperty AnchorablesSourceProperty = DependencyProperty.Register(nameof(AnchorablesSource), typeof(IEnumerable), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnAnchorablesSourceChanged));
+
+		/// <summary>Gets/sets the source collection for all <see cref="LayoutAnchorable"/> objects managed in this framework.</summary>
+		[Bindable(true), Description("Gets/sets the source collection for all LayoutAnchorable objects managed in this framework."), Category("Anchorable")]
+		public IEnumerable AnchorablesSource
+		{
+			get => (IEnumerable)GetValue(AnchorablesSourceProperty);
+			set => SetValue(AnchorablesSourceProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="AnchorablesSource"/> property.</summary>
+		private static void OnAnchorablesSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnAnchorablesSourceChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="AnchorablesSource"/> property.</summary>
+		protected virtual void OnAnchorablesSourceChanged(DependencyPropertyChangedEventArgs e)
+		{
+			DetachAnchorablesSource(Layout, e.OldValue as IEnumerable);
+			AttachAnchorablesSource(Layout, e.NewValue as IEnumerable);
+		}
+
+		#endregion AnchorablesSource
+
+		#region ActiveContent
+
+		/// <summary><see cref="ActiveContent"/> dependency property.</summary>
+		public static readonly DependencyProperty ActiveContentProperty = DependencyProperty.Register(nameof(ActiveContent), typeof(object), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnActiveContentChanged));
+
+		/// <summary>Gets/sets the content that is currently active (document,anchoreable, or null).</summary>
+		[Bindable(true), Description("Gets/sets the content that is currently active (document,anchoreable, or null)."), Category("Other")]
+		public object ActiveContent
+		{
+			get => (object)GetValue(ActiveContentProperty);
+			set => SetValue(ActiveContentProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="ActiveContent"/> property.</summary>
+		private static void OnActiveContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		{
+			((DockingManager)d).InternalSetActiveContent(e.NewValue);
+			((DockingManager)d).OnActiveContentChanged(e);
+		}
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="ActiveContent"/> property.</summary>
+		protected virtual void OnActiveContentChanged(DependencyPropertyChangedEventArgs e) => ActiveContentChanged?.Invoke(this, EventArgs.Empty);
+
+		#endregion ActiveContent
+
+		#region AnchorableContextMenu
+
+		/// <summary><see cref="AnchorableContextMenu"/> dependency property.</summary>
+		public static readonly DependencyProperty AnchorableContextMenuProperty = DependencyProperty.Register(nameof(AnchorableContextMenu), typeof(ContextMenu), typeof(DockingManager),
+				new FrameworkPropertyMetadata((ContextMenu)null, OnContextMenuPropertyChanged));
+
+		/// <summary>Gets/sets the <see cref="ContextMenu"/> to show on an anchorable.</summary>
+		[Bindable(true), Description("Gets/sets the ContextMenu to show on an anchorable."), Category("Anchorable")]
+		public ContextMenu AnchorableContextMenu
+		{
+			get => (ContextMenu)GetValue(AnchorableContextMenuProperty);
+			set => SetValue(AnchorableContextMenuProperty, value);
+		}
+
+		#endregion AnchorableContextMenu
+
+		#region Theme
+
+		/// <summary><see cref="Theme"/> dependency property.</summary>
+		public static readonly DependencyProperty ThemeProperty = DependencyProperty.Register(nameof(Theme), typeof(Theme), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnThemeChanged));
+
+		/// <summary>Gets/sets the <see cref="Theme"/> to be used for the controls in this framework.</summary>
+		[Bindable(true), Description("Gets/sets the Theme to be used for the controls in this framework."), Category("Other")]
+		public Theme Theme
+		{
+			get => (Theme)GetValue(ThemeProperty);
+			set => SetValue(ThemeProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="Theme"/> property.</summary>
+		private static void OnThemeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnThemeChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="Theme"/> property.</summary>
+		protected virtual void OnThemeChanged(DependencyPropertyChangedEventArgs e)
+		{
+			var oldTheme = e.OldValue as Theme;
+			var resources = Resources;
+			if (oldTheme != null)
+			{
+				var resourceDictionaryToRemove =
+					resources.MergedDictionaries.FirstOrDefault(r => r.Source == oldTheme.GetResourceUri());
+				if (resourceDictionaryToRemove != null)
+					resources.MergedDictionaries.Remove(
+						resourceDictionaryToRemove);
+			}
+
+			if (e.NewValue as Theme != null)
+			{
+				resources.MergedDictionaries.Add(new ResourceDictionary { Source = (e.NewValue as Theme).GetResourceUri() });
+			}
+
+			foreach (var fwc in _fwList)
+				fwc.UpdateThemeResources(oldTheme);
+
+			_navigatorWindow?.UpdateThemeResources();
+			_overlayWindow?.UpdateThemeResources();
+		}
+
+		#endregion Theme
+
+		#region GridSplitterWidth
+
+		/// <summary><see cref="GridSplitterWidth"/> dependency property.</summary>
+		public static readonly DependencyProperty GridSplitterWidthProperty = DependencyProperty.Register(nameof(GridSplitterWidth), typeof(double), typeof(DockingManager),
+				new FrameworkPropertyMetadata(6.0));
+
+		/// <summary>Gets/sets the width of a grid splitter.</summary>
+		[Bindable(true), Description("Gets/sets the width of a grid splitter"), Category("Other")]
+		public double GridSplitterWidth
+		{
+			get => (double)GetValue(GridSplitterWidthProperty);
+			set => SetValue(GridSplitterWidthProperty, value);
+		}
+
+		#endregion GridSplitterWidth
+
+		#region GridSplitterHeight
+
+		/// <summary><see cref="GridSplitterHeight"/> dependency property.</summary>
+		public static readonly DependencyProperty GridSplitterHeightProperty = DependencyProperty.Register(nameof(GridSplitterHeight), typeof(double), typeof(DockingManager),
+				new FrameworkPropertyMetadata(6.0));
+
+		/// <summary>Gets/sets the height of a grid splitter.</summary>
+		[Bindable(true), Description("Gets/sets the height of a grid splitter"), Category("Other")]
+		public double GridSplitterHeight
+		{
+			get => (double)GetValue(GridSplitterHeightProperty);
+			set => SetValue(GridSplitterHeightProperty, value);
+		}
+
+		#endregion GridSplitterHeight
+
+		#region DocumentPaneMenuItemHeaderTemplate
+
+		/// <summary><see cref="DocumentPaneMenuItemHeaderTemplate"/> dependency property.</summary>
+		public static readonly DependencyProperty DocumentPaneMenuItemHeaderTemplateProperty = DependencyProperty.Register(nameof(DocumentPaneMenuItemHeaderTemplate), typeof(DataTemplate), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnDocumentPaneMenuItemHeaderTemplateChanged, CoerceDocumentPaneMenuItemHeaderTemplateValue));
+
+		/// <summary>Gets/sets the <see cref="DataTemplate"/> for the header to display menu dropdown items on a document pane.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplate for the header to display menu dropdown items on a document pane."), Category("Other")]
+		public DataTemplate DocumentPaneMenuItemHeaderTemplate
+		{
+			get => (DataTemplate)GetValue(DocumentPaneMenuItemHeaderTemplateProperty);
+			set => SetValue(DocumentPaneMenuItemHeaderTemplateProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="DocumentPaneMenuItemHeaderTemplate"/> property.</summary>
+		private static void OnDocumentPaneMenuItemHeaderTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentPaneMenuItemHeaderTemplateChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentPaneMenuItemHeaderTemplate"/> property.</summary>
+		protected virtual void OnDocumentPaneMenuItemHeaderTemplateChanged(DependencyPropertyChangedEventArgs e)
+		{
+		}
+
+		/// <summary>Coerces the <see cref="DocumentPaneMenuItemHeaderTemplate"/> value.</summary>
+		private static object CoerceDocumentPaneMenuItemHeaderTemplateValue(DependencyObject d, object value)
+		{
+			if (value != null && d.GetValue(DocumentPaneMenuItemHeaderTemplateSelectorProperty) != null)
+				return null;
+			return value ?? d.GetValue(DocumentHeaderTemplateProperty);
+		}
+
+		#endregion DocumentPaneMenuItemHeaderTemplate
+
+		#region DocumentPaneMenuItemHeaderTemplateSelector
+
+		/// <summary><see cref="DocumentPaneMenuItemHeaderTemplateSelector"/> dependency property.</summary>
+		public static readonly DependencyProperty DocumentPaneMenuItemHeaderTemplateSelectorProperty = DependencyProperty.Register(nameof(DocumentPaneMenuItemHeaderTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnDocumentPaneMenuItemHeaderTemplateSelectorChanged, CoerceDocumentPaneMenuItemHeaderTemplateSelectorValue));
+
+		/// <summary>Gets/sets the <see cref="DataTemplateSelector"/> to select a <see cref="DataTemplate"/> for the menu items shown when user selects the <see cref="LayoutDocumentPaneControl"/> context menu switch.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplateSelector to select a DataTemplate for the menu items shown when user selects the LayoutDocumentPaneControl context menu switch."), Category("Document")]
+		public DataTemplateSelector DocumentPaneMenuItemHeaderTemplateSelector
+		{
+			get => (DataTemplateSelector)GetValue(DocumentPaneMenuItemHeaderTemplateSelectorProperty);
+			set => SetValue(DocumentPaneMenuItemHeaderTemplateSelectorProperty, value);
+		}
+
+		/// <summary>Handles changes to the <see cref="DocumentPaneMenuItemHeaderTemplateSelector"/> property.</summary>
+		private static void OnDocumentPaneMenuItemHeaderTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnDocumentPaneMenuItemHeaderTemplateSelectorChanged(e);
+
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="DocumentPaneMenuItemHeaderTemplateSelector"/> property.</summary>
+		protected virtual void OnDocumentPaneMenuItemHeaderTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+		{
+			if (e.NewValue != null && DocumentPaneMenuItemHeaderTemplate != null)
+				DocumentPaneMenuItemHeaderTemplate = null;
+		}
 
-        /// <summary><see cref="IconContentTemplate"/> dependency property.</summary>
-        public static readonly DependencyProperty IconContentTemplateProperty = DependencyProperty.Register(nameof(IconContentTemplate), typeof(DataTemplate), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplate)null));
+		/// <summary>Coerces the <see cref="DocumentPaneMenuItemHeaderTemplateSelector"/> value.</summary>
+		private static object CoerceDocumentPaneMenuItemHeaderTemplateSelectorValue(DependencyObject d, object value) => value;
 
-        /// <summary>Gets/sets the <see cref="DataTemplate"/> to use on the icon extracted from the layout model.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplate to use on the icon extracted from the layout model."), Category("Other")]
-        public DataTemplate IconContentTemplate
-        {
-            get => (DataTemplate)GetValue(IconContentTemplateProperty);
-            set => SetValue(IconContentTemplateProperty, value);
-        }
-
-        #endregion IconContentTemplate
+		#endregion DocumentPaneMenuItemHeaderTemplateSelector
 
-        #region IconContentTemplateSelector
+		#region IconContentTemplate
 
-        /// <summary><see cref="IconContentTemplateSelector"/> dependency property.</summary>
-        public static readonly DependencyProperty IconContentTemplateSelectorProperty = DependencyProperty.Register(nameof(IconContentTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata((DataTemplateSelector)null));
+		/// <summary><see cref="IconContentTemplate"/> dependency property.</summary>
+		public static readonly DependencyProperty IconContentTemplateProperty = DependencyProperty.Register(nameof(IconContentTemplate), typeof(DataTemplate), typeof(DockingManager),
+				new FrameworkPropertyMetadata((DataTemplate)null));
 
-        /// <summary>Gets/sets the <see cref="DataTemplateSelector"/> to select a <see cref="DataTemplate"/> for a content icon.</summary>
-        [Bindable(true), Description("Gets/sets the DataTemplateSelector to select a DataTemplate for a content icon."), Category("Other")]
-        public DataTemplateSelector IconContentTemplateSelector
-        {
-            get => (DataTemplateSelector)GetValue(IconContentTemplateSelectorProperty);
-            set => SetValue(IconContentTemplateSelectorProperty, value);
-        }
+		/// <summary>Gets/sets the <see cref="DataTemplate"/> to use on the icon extracted from the layout model.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplate to use on the icon extracted from the layout model."), Category("Other")]
+		public DataTemplate IconContentTemplate
+		{
+			get => (DataTemplate)GetValue(IconContentTemplateProperty);
+			set => SetValue(IconContentTemplateProperty, value);
+		}
+
+		#endregion IconContentTemplate
 
-        #endregion IconContentTemplateSelector
+		#region IconContentTemplateSelector
 
-        #region LayoutItemContainerStyle
+		/// <summary><see cref="IconContentTemplateSelector"/> dependency property.</summary>
+		public static readonly DependencyProperty IconContentTemplateSelectorProperty = DependencyProperty.Register(nameof(IconContentTemplateSelector), typeof(DataTemplateSelector), typeof(DockingManager),
+				new FrameworkPropertyMetadata((DataTemplateSelector)null));
 
-        /// <summary><see cref="LayoutItemContainerStyle"/> dependency property.</summary>
-        public static readonly DependencyProperty LayoutItemContainerStyleProperty = DependencyProperty.Register(nameof(LayoutItemContainerStyle), typeof(Style), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnLayoutItemContainerStyleChanged));
+		/// <summary>Gets/sets the <see cref="DataTemplateSelector"/> to select a <see cref="DataTemplate"/> for a content icon.</summary>
+		[Bindable(true), Description("Gets/sets the DataTemplateSelector to select a DataTemplate for a content icon."), Category("Other")]
+		public DataTemplateSelector IconContentTemplateSelector
+		{
+			get => (DataTemplateSelector)GetValue(IconContentTemplateSelectorProperty);
+			set => SetValue(IconContentTemplateSelectorProperty, value);
+		}
 
-        /// <summary>Gets/sets the <see cref="Style"/> to apply to a <see cref="LayoutDocumentItem"/> object.</summary>
-        [Bindable(true), Description("Gets/sets the Style to apply to a LayoutDocumentItem object."), Category("Layout")]
-        public Style LayoutItemContainerStyle
-        {
-            get => (Style)GetValue(LayoutItemContainerStyleProperty);
-            set => SetValue(LayoutItemContainerStyleProperty, value);
-        }
+		#endregion IconContentTemplateSelector
 
-        /// <summary>Handles changes to the <see cref="LayoutItemContainerStyle"/> property.</summary>
-        private static void OnLayoutItemContainerStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLayoutItemContainerStyleChanged(e);
+		#region LayoutItemContainerStyle
 
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="LayoutItemContainerStyle"/> property.</summary>
-        protected virtual void OnLayoutItemContainerStyleChanged(DependencyPropertyChangedEventArgs e) => AttachLayoutItems();
+		/// <summary><see cref="LayoutItemContainerStyle"/> dependency property.</summary>
+		public static readonly DependencyProperty LayoutItemContainerStyleProperty = DependencyProperty.Register(nameof(LayoutItemContainerStyle), typeof(Style), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnLayoutItemContainerStyleChanged));
 
-        #endregion LayoutItemContainerStyle
+		/// <summary>Gets/sets the <see cref="Style"/> to apply to a <see cref="LayoutDocumentItem"/> object.</summary>
+		[Bindable(true), Description("Gets/sets the Style to apply to a LayoutDocumentItem object."), Category("Layout")]
+		public Style LayoutItemContainerStyle
+		{
+			get => (Style)GetValue(LayoutItemContainerStyleProperty);
+			set => SetValue(LayoutItemContainerStyleProperty, value);
+		}
 
-        #region LayoutItemContainerStyleSelector
+		/// <summary>Handles changes to the <see cref="LayoutItemContainerStyle"/> property.</summary>
+		private static void OnLayoutItemContainerStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLayoutItemContainerStyleChanged(e);
 
-        /// <summary><see cref="LayoutItemContainerStyleSelector"/> dependency property.</summary>
-        public static readonly DependencyProperty LayoutItemContainerStyleSelectorProperty = DependencyProperty.Register(nameof(LayoutItemContainerStyleSelector), typeof(StyleSelector), typeof(DockingManager),
-                new FrameworkPropertyMetadata(null, OnLayoutItemContainerStyleSelectorChanged));
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="LayoutItemContainerStyle"/> property.</summary>
+		protected virtual void OnLayoutItemContainerStyleChanged(DependencyPropertyChangedEventArgs e) => AttachLayoutItems();
 
-        /// <summary>Gets/sets the <see cref="StyleSelector"/> to select the <see cref="Style"/> for a <see cref="LayoutDocumentItem"/>.</summary>
-        [Bindable(true), Description("Gets/sets the StyleSelector to select the Style for a LayoutDocumentItem."), Category("Layout")]
-        public StyleSelector LayoutItemContainerStyleSelector
-        {
-            get => (StyleSelector)GetValue(LayoutItemContainerStyleSelectorProperty);
-            set => SetValue(LayoutItemContainerStyleSelectorProperty, value);
-        }
+		#endregion LayoutItemContainerStyle
 
-        /// <summary>Handles changes to the <see cref="LayoutItemContainerStyleSelector"/> property.</summary>
-        private static void OnLayoutItemContainerStyleSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLayoutItemContainerStyleSelectorChanged(e);
+		#region LayoutItemContainerStyleSelector
 
-        /// <summary>Provides derived classes an opportunity to handle changes to the <see cref="LayoutItemContainerStyleSelector"/> property.</summary>
-        protected virtual void OnLayoutItemContainerStyleSelectorChanged(DependencyPropertyChangedEventArgs e) => AttachLayoutItems();
+		/// <summary><see cref="LayoutItemContainerStyleSelector"/> dependency property.</summary>
+		public static readonly DependencyProperty LayoutItemContainerStyleSelectorProperty = DependencyProperty.Register(nameof(LayoutItemContainerStyleSelector), typeof(StyleSelector), typeof(DockingManager),
+				new FrameworkPropertyMetadata(null, OnLayoutItemContainerStyleSelectorChanged));
 
-        #endregion LayoutItemContainerStyleSelector
+		/// <summary>Gets/sets the <see cref="StyleSelector"/> to select the <see cref="Style"/> for a <see cref="LayoutDocumentItem"/>.</summary>
+		[Bindable(true), Description("Gets/sets the StyleSelector to select the Style for a LayoutDocumentItem."), Category("Layout")]
+		public StyleSelector LayoutItemContainerStyleSelector
+		{
+			get => (StyleSelector)GetValue(LayoutItemContainerStyleSelectorProperty);
+			set => SetValue(LayoutItemContainerStyleSelectorProperty, value);
+		}
 
-        #region ShowSystemMenu
+		/// <summary>Handles changes to the <see cref="LayoutItemContainerStyleSelector"/> property.</summary>
+		private static void OnLayoutItemContainerStyleSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((DockingManager)d).OnLayoutItemContainerStyleSelectorChanged(e);
 
-        /// <summary><see cref="ShowSystemMenu"/> dependency property.</summary>
-        public static readonly DependencyProperty ShowSystemMenuProperty = DependencyProperty.Register(nameof(ShowSystemMenu), typeof(bool), typeof(DockingManager),
-                new FrameworkPropertyMetadata(true));
+		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="LayoutItemContainerStyleSelector"/> property.</summary>
+		protected virtual void OnLayoutItemContainerStyleSelectorChanged(DependencyPropertyChangedEventArgs e) => AttachLayoutItems();
 
-        /// <summary>Gets/sets whether floating windows should show the system menu when a custom context menu is not defined.</summary>
-        [Bindable(true), Description("Gets/sets whether floating windows should show the system menu when a custom context menu is not defined."), Category("FloatingWindow")]
-        public bool ShowSystemMenu
-        {
-            get => (bool)GetValue(ShowSystemMenuProperty);
-            set => SetValue(ShowSystemMenuProperty, value);
-        }
+		#endregion LayoutItemContainerStyleSelector
 
-        #endregion ShowSystemMenu
+		#region ShowSystemMenu
 
-        #region AllowMixedOrientation
+		/// <summary><see cref="ShowSystemMenu"/> dependency property.</summary>
+		public static readonly DependencyProperty ShowSystemMenuProperty = DependencyProperty.Register(nameof(ShowSystemMenu), typeof(bool), typeof(DockingManager),
+				new FrameworkPropertyMetadata(true));
 
-        /// <summary><see cref="AllowMixedOrientation"/> dependency property.</summary>
-        public static readonly DependencyProperty AllowMixedOrientationProperty = DependencyProperty.Register(nameof(AllowMixedOrientation), typeof(bool), typeof(DockingManager),
-                new FrameworkPropertyMetadata(false));
+		/// <summary>Gets/sets whether floating windows should show the system menu when a custom context menu is not defined.</summary>
+		[Bindable(true), Description("Gets/sets whether floating windows should show the system menu when a custom context menu is not defined."), Category("FloatingWindow")]
+		public bool ShowSystemMenu
+		{
+			get => (bool)GetValue(ShowSystemMenuProperty);
+			set => SetValue(ShowSystemMenuProperty, value);
+		}
 
-        /// <summary>Gets/sets whether the DockingManager should allow mixed orientation for document panes.</summary>
-        [Bindable(true), Description("Gets/sets whether the DockingManager should allow mixed orientation for document panes."), Category("Other")]
-        public bool AllowMixedOrientation
-        {
-            get => (bool)GetValue(AllowMixedOrientationProperty);
-            set => SetValue(AllowMixedOrientationProperty, value);
-        }
+		#endregion ShowSystemMenu
 
-        #endregion AllowMixedOrientation
+		#region AllowMixedOrientation
 
-        #region IsVirtualizingLayoutDocument IsVirtualizingLayoutAnchorable
+		/// <summary><see cref="AllowMixedOrientation"/> dependency property.</summary>
+		public static readonly DependencyProperty AllowMixedOrientationProperty = DependencyProperty.Register(nameof(AllowMixedOrientation), typeof(bool), typeof(DockingManager),
+				new FrameworkPropertyMetadata(false));
 
-        /// <summary>Gets/sets (a simple non-dependency property) to determine whether the
-        /// <see cref="LayoutDocumentPaneControl"/> is virtualizing its tabbed item child controls or not.</summary>
-        [Bindable(false), Description("Gets/sets whether the LayoutDocumentPaneControl is virtualizing its tabbed item child controls or not."), Category("Document")]
-        public bool IsVirtualizingDocument { get; set; }
+		/// <summary>Gets/sets whether the DockingManager should allow mixed orientation for document panes.</summary>
+		[Bindable(true), Description("Gets/sets whether the DockingManager should allow mixed orientation for document panes."), Category("Other")]
+		public bool AllowMixedOrientation
+		{
+			get => (bool)GetValue(AllowMixedOrientationProperty);
+			set => SetValue(AllowMixedOrientationProperty, value);
+		}
 
-        /// <summary>Gets/sets (a simple non-dependency property) to determine whether the
-        /// <see cref="LayoutAnchorablePaneControl"/> is virtualizing its tabbed item child controls or not.</summary>
-        [Bindable(false), Description("Gets/sets whether the LayoutAnchorablePaneControl is virtualizing its tabbed item child controls or not."), Category("Anchorable")]
-        public bool IsVirtualizingAnchorable { get; set; }
+		#endregion AllowMixedOrientation
 
-        #endregion IsVirtualizingLayoutDocument IsVirtualizingLayoutAnchorable
+		#region IsVirtualizingLayoutDocument IsVirtualizingLayoutAnchorable
 
+		/// <summary>Gets/sets (a simple non-dependency property) to determine whether the
+		/// <see cref="LayoutDocumentPaneControl"/> is virtualizing its tabbed item child controls or not.</summary>
+		[Bindable(false), Description("Gets/sets whether the LayoutDocumentPaneControl is virtualizing its tabbed item child controls or not."), Category("Document")]
+		public bool IsVirtualizingDocument { get; set; }
 
-        #region AutoWindowSizeWhenOpened
+		/// <summary>Gets/sets (a simple non-dependency property) to determine whether the
+		/// <see cref="LayoutAnchorablePaneControl"/> is virtualizing its tabbed item child controls or not.</summary>
+		[Bindable(false), Description("Gets/sets whether the LayoutAnchorablePaneControl is virtualizing its tabbed item child controls or not."), Category("Anchorable")]
+		public bool IsVirtualizingAnchorable { get; set; }
 
-        /// <summary>
-        /// Gets/sets whether the floating window size of a <see cref="LayoutFloatingWindowControl"/> is auto sized when it is dragged out.
-        /// If true the MinHeight and MinWidth of the content will be used together with the margins to determine the initial size of the floating window.
-        /// </summary>
-        [Bindable(true), Description("Gets/sets whether the floating window is auto sized when it is dragged out."), Category("FloatingWindow")]
-        public bool AutoWindowSizeWhenOpened
-        {
-            get { return (bool)GetValue(AutoWindowSizeWhenOpenedProperty); }
-            set { SetValue(AutoWindowSizeWhenOpenedProperty, value); }
-        }
+		#endregion IsVirtualizingLayoutDocument IsVirtualizingLayoutAnchorable
 
-        public static readonly DependencyProperty AutoWindowSizeWhenOpenedProperty =
-            DependencyProperty.Register("AutoWindowSizeWhenOpened", typeof(bool), typeof(DockingManager), new PropertyMetadata(false));
+		#region AutoWindowSizeWhenOpened
 
+		/// <summary>
+		/// Gets/sets whether the floating window size of a <see cref="LayoutFloatingWindowControl"/> is auto sized when it is dragged out.
+		/// If true the MinHeight and MinWidth of the content will be used together with the margins to determine the initial size of the floating window.
+		/// </summary>
+		[Bindable(true), Description("Gets/sets whether the floating window is auto sized when it is dragged out."), Category("FloatingWindow")]
+		public bool AutoWindowSizeWhenOpened
+		{
+			get { return (bool)GetValue(AutoWindowSizeWhenOpenedProperty); }
+			set { SetValue(AutoWindowSizeWhenOpenedProperty, value); }
+		}
 
-        #endregion AutoWindowSizeWhenOpened
+		public static readonly DependencyProperty AutoWindowSizeWhenOpenedProperty =
+			DependencyProperty.Register("AutoWindowSizeWhenOpened", typeof(bool), typeof(DockingManager), new PropertyMetadata(false));
 
-        #endregion Public Properties
+		#endregion AutoWindowSizeWhenOpened
 
-        #region LogicalChildren
+		#endregion Public Properties
 
-        private readonly List<WeakReference> _logicalChildren = new List<WeakReference>();
+		#region LogicalChildren
 
-        /// <inheritdoc />
-        protected override IEnumerator LogicalChildren => _logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).GetEnumerator();
+		private readonly List<WeakReference> _logicalChildren = new List<WeakReference>();
 
-        public IEnumerator LogicalChildrenPublic => LogicalChildren;
+		/// <inheritdoc />
+		protected override IEnumerator LogicalChildren => _logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).GetEnumerator();
 
+		public IEnumerator LogicalChildrenPublic => LogicalChildren;
 
-        internal void InternalAddLogicalChild(object element)
-        {
+		internal void InternalAddLogicalChild(object element)
+		{
 #if DEBUG
-            if (_logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).Contains(element))
-                throw new InvalidOperationException();
+			if (_logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).Contains(element))
+				throw new InvalidOperationException();
 #endif
-            if (_logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).Contains(element))
-                return;
-
-            _logicalChildren.Add(new WeakReference(element));
-            AddLogicalChild(element);
-        }
-
-        internal void InternalRemoveLogicalChild(object element)
-        {
-            var wrToRemove = _logicalChildren.FirstOrDefault(ch => ch.GetValueOrDefault<object>() == element);
-            if (wrToRemove != null)
-                _logicalChildren.Remove(wrToRemove);
-            RemoveLogicalChild(element);
-        }
-
-        private void ClearLogicalChildrenList()
-        {
-            foreach (var child in _logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).ToArray())
-                RemoveLogicalChild(child);
-            _logicalChildren.Clear();
-        }
-
-        #endregion LogicalChildren
-
-        #region Private Properties
-
-        private bool IsNavigatorWindowActive => _navigatorWindow != null;
-
-        #endregion Private Properties
-
-        #region IOverlayWindowHost Interface
-        /// <inheritdoc/>
-        bool IOverlayWindowHost.HitTest(Point dragPoint)
-        {
-            try
-            {
-                var detectionRect = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
-                return detectionRect.Contains(dragPoint);
-            }
-            catch
-            {
-                // Silently swallow exception that may occur if DockingManager is not visible (because its hidden by a tab)
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        DockingManager IOverlayWindowHost.Manager => this;
-
-        /// <inheritdoc/>
-        IOverlayWindow IOverlayWindowHost.ShowOverlayWindow(LayoutFloatingWindowControl draggingWindow)
-        {
-            CreateOverlayWindow();
-            _overlayWindow.Owner = draggingWindow;
-            _overlayWindow.EnableDropTargets();
-            _overlayWindow.Show();
-            return _overlayWindow;
-        }
-
-        /// <inheritdoc/>
-        void IOverlayWindowHost.HideOverlayWindow()
-        {
-            _areas = null;
-            _overlayWindow.Owner = null;
-            _overlayWindow.HideDropTargets();
-        }
-
-        /// <inheritdoc/>
-        IEnumerable<IDropArea> IOverlayWindowHost.GetDropAreas(LayoutFloatingWindowControl draggingWindow)
-        {
-            if (_areas != null) return _areas;
-            _areas = new List<IDropArea>();
-            var isDraggingDocuments = draggingWindow.Model is LayoutDocumentFloatingWindow;
-            if (!isDraggingDocuments)
-            {
-                _areas.Add(new DropArea<DockingManager>(this, DropAreaType.DockingManager));
-                foreach (var areaHost in this.FindVisualChildren<LayoutAnchorablePaneControl>())
-                    if (areaHost.Model.Descendents().Any()) _areas.Add(new DropArea<LayoutAnchorablePaneControl>(areaHost, DropAreaType.AnchorablePane));
-            }
-
-            // Determine if floatingWindow is configured to dock as document or not
-            var dockAsDocument = true;
-            if (!isDraggingDocuments)
-            {
-                if (draggingWindow.Model is LayoutAnchorableFloatingWindow toolWindow)
-                {
-                    foreach (var item in GetAnchorableInFloatingWindow(draggingWindow))
-                    {
-                        if (item.CanDockAsTabbedDocument != false) continue;
-                        dockAsDocument = false;
-                        break;
-                    }
-                }
-            }
-
-            // Dock only documents and tools in DocumentPane if configuration does allow that
-            if (dockAsDocument)
-            {
-                foreach (var areaHost in this.FindVisualChildren<LayoutDocumentPaneControl>())
-                    _areas.Add(new DropArea<LayoutDocumentPaneControl>(areaHost, DropAreaType.DocumentPane));
-            }
-
-            foreach (var areaHost in this.FindVisualChildren<LayoutDocumentPaneGroupControl>())
-            {
-                var documentGroupModel = areaHost.Model as LayoutDocumentPaneGroup;
-                if (!documentGroupModel.Children.Any(c => c.IsVisible))
-                    _areas.Add(new DropArea<LayoutDocumentPaneGroupControl>(areaHost, DropAreaType.DocumentPaneGroup));
-            }
-
-            return _areas;
-        }
-
-        /// <summary>
-        /// Finds all <see cref="LayoutAnchorable"/> objects (tool windows) within a
-        /// <see cref="LayoutFloatingWindow"/> (if any) and return them.
-        /// </summary>
-        /// <param name="draggingWindow"></param>
-        /// <returns></returns>
-        private IEnumerable<LayoutAnchorable> GetAnchorableInFloatingWindow(LayoutFloatingWindowControl draggingWindow)
-        {
-            if (!(draggingWindow.Model is LayoutAnchorableFloatingWindow layoutAnchorableFloatingWindow)) yield break;
-            //big part of code for getting type
-
-            if (layoutAnchorableFloatingWindow.SinglePane is LayoutAnchorablePane layoutAnchorablePane && (layoutAnchorableFloatingWindow.IsSinglePane && layoutAnchorablePane.SelectedContent != null))
-            {
-                var layoutAnchorable = ((LayoutAnchorablePane)layoutAnchorableFloatingWindow.SinglePane).SelectedContent as LayoutAnchorable;
-                yield return layoutAnchorable;
-            }
-            else
-                foreach (var item in GetLayoutAnchorable(layoutAnchorableFloatingWindow.RootPanel))
-                    yield return item;
-        }
-
-        /// <summary>
-        /// Finds all <see cref="LayoutAnchorable"/> objects (toolwindows) within a
-        /// <see cref="LayoutAnchorablePaneGroup"/> (if any) and return them.
-        /// </summary>
-        /// <param name="layoutAnchPaneGroup"></param>
-        /// <returns>All the anchorable items found.</returns>
-        /// <seealso cref="LayoutAnchorable"/>
-        /// <seealso cref="LayoutAnchorablePaneGroup"/>
-        internal IEnumerable<LayoutAnchorable> GetLayoutAnchorable(LayoutAnchorablePaneGroup layoutAnchPaneGroup)
-        {
-            if (layoutAnchPaneGroup == null) yield break;
-            foreach (var anchorable in layoutAnchPaneGroup.Descendents().OfType<LayoutAnchorable>())
-                yield return anchorable;
-        }
-        #endregion IOverlayWindowHost Interface
-
-        #region Public Methods
-
-        /// <summary>Return the LayoutItem wrapper for the content passed as argument.</summary>
-        /// <param name="content">LayoutContent to search</param>
-        /// <returns>Either a <see cref="LayoutAnchorableItem"/> or <see cref="LayoutDocumentItem"/> which contains the <see cref="LayoutContent"/> passed as argument.</returns>
-        public LayoutItem GetLayoutItemFromModel(LayoutContent content)
-        {
-            return _layoutItems.FirstOrDefault(item => item.LayoutElement == content);
-        }
-
-        public LayoutFloatingWindowControl CreateFloatingWindow(LayoutContent contentModel, bool isContentImmutable)
-        {
-            if (contentModel is LayoutAnchorable anchorable)
-            {
-                if (!(contentModel.Parent is ILayoutPane))
-                {
-                    var pane = new LayoutAnchorablePane(anchorable)
-                    {
-                        FloatingTop = contentModel.FloatingTop,
-                        FloatingLeft = contentModel.FloatingLeft,
-                        FloatingWidth = contentModel.FloatingWidth,
-                        FloatingHeight = contentModel.FloatingHeight
-                    };
-                    _ = CreateFloatingWindowForLayoutAnchorableWithoutParent(pane, isContentImmutable);
-                }
-            }
-
-            return CreateFloatingWindowCore(contentModel, isContentImmutable);
-        }
-
-        #endregion Public Methods
-
-        #region Internal Methods
-        /// <summary>
-        /// Method is invoked to create the actual visible UI element from a given layout model. It is invoked when:
-        /// 
-        /// 1. New UI items are created and layed out or
-        /// 2. Layout is deserialized, and the previous UI items are restored to the screen
-        ///    (using the model who's information was serialized to XML).
-        /// </summary>
-        /// <param name="model">The layout element.</param>
-        /// <returns></returns>
-        internal UIElement CreateUIElementForModel(ILayoutElement model)
-        {
-            if (model is LayoutPanel)
-                return new LayoutPanelControl(model as LayoutPanel);
-            if (model is LayoutAnchorablePaneGroup)
-                return new LayoutAnchorablePaneGroupControl(model as LayoutAnchorablePaneGroup);
-            if (model is LayoutDocumentPaneGroup)
-                return new LayoutDocumentPaneGroupControl(model as LayoutDocumentPaneGroup);
-
-            if (model is LayoutAnchorSide)
-            {
-                var templateModelView = new LayoutAnchorSideControl(model as LayoutAnchorSide);
-                templateModelView.SetBinding(TemplateProperty, new Binding(AnchorSideTemplateProperty.Name) { Source = this });
-                return templateModelView;
-            }
-            if (model is LayoutAnchorGroup)
-            {
-                var templateModelView = new LayoutAnchorGroupControl(model as LayoutAnchorGroup);
-                templateModelView.SetBinding(TemplateProperty, new Binding(AnchorGroupTemplateProperty.Name) { Source = this });
-                return templateModelView;
-            }
-
-            if (model is LayoutDocumentPane)
-            {
-                var templateModelView = new LayoutDocumentPaneControl(model as LayoutDocumentPane, IsVirtualizingDocument);
-                templateModelView.SetBinding(StyleProperty, new Binding(DocumentPaneControlStyleProperty.Name) { Source = this });
-                return templateModelView;
-            }
-            if (model is LayoutAnchorablePane)
-            {
-                var templateModelView = new LayoutAnchorablePaneControl(model as LayoutAnchorablePane, IsVirtualizingAnchorable);
-                templateModelView.SetBinding(StyleProperty, new Binding(AnchorablePaneControlStyleProperty.Name) { Source = this });
-                return templateModelView;
-            }
-
-            if (model is LayoutAnchorableFloatingWindow)
-            {
-                if (DesignerProperties.GetIsInDesignMode(this)) return null;
-                var modelFW = model as LayoutAnchorableFloatingWindow;
-                var newFW = new LayoutAnchorableFloatingWindowControl(modelFW)
-                {
-                    //Owner = Window.GetWindow(this) 
-                };
-                newFW.SetParentToMainWindowOf(this);
-
-                // Floating Window can also contain only Pane Groups at its base (issue #27) so we check for
-                // RootPanel (which is a LayoutAnchorablePaneGroup) and make sure the window is positioned back
-                // in current (or nearest) monitor
-                var panegroup = modelFW.RootPanel;
-                if (panegroup != null)
-                {
-                    panegroup.KeepInsideNearestMonitor();  // Check position is valid in current setup
-
-                    newFW.Left = panegroup.FloatingLeft;   // Position the window to previous or nearest valid position
-                    newFW.Top = panegroup.FloatingTop;
-                    newFW.Width = panegroup.FloatingWidth;
-                    newFW.Height = panegroup.FloatingHeight;
-                }
-
-                newFW.ShowInTaskbar = false;
-
-                Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    if (newFW.Content != null || (newFW.Model as LayoutAnchorableFloatingWindow)?.IsVisible == true)
-                        newFW.Show();
-                    else
-                        newFW.Hide();
-                }), DispatcherPriority.Send);
-
-                if (panegroup != null && panegroup.IsMaximized)
-                    newFW.WindowState = WindowState.Maximized;
-                return newFW;
-            }
-
-            if (model is LayoutDocumentFloatingWindow)
-            {
-                if (DesignerProperties.GetIsInDesignMode(this))
-                    return null;
-                var modelFW = model as LayoutDocumentFloatingWindow;
-                var newFW = new LayoutDocumentFloatingWindowControl(modelFW)
-                {
-                    //Owner = Window.GetWindow(this) 
-                };
-                newFW.SetParentToMainWindowOf(this);
-
-                var paneForExtensions = modelFW.RootPanel;
-                if (paneForExtensions != null)
-                {
-                    //ensure that floating window position is inside current (or nearest) monitor
-                    paneForExtensions.KeepInsideNearestMonitor();
-
-                    newFW.Left = paneForExtensions.FloatingLeft;
-                    newFW.Top = paneForExtensions.FloatingTop;
-                    newFW.Width = paneForExtensions.FloatingWidth;
-                    newFW.Height = paneForExtensions.FloatingHeight;
-                }
-                newFW.ShowInTaskbar = false;
-                newFW.Show();
-                // Do not set the WindowState before showing or it will be lost
-                if (paneForExtensions != null && paneForExtensions.IsMaximized)
-                    newFW.WindowState = WindowState.Maximized;
-                return newFW;
-            }
-            if (model is LayoutDocument layoutDocument)
-            {
-                var templateModelView = new LayoutDocumentControl { Model = layoutDocument };
-                return templateModelView;
-            }
-            return null;
-        }
-
-        /// <summary>Method is invoked to pop put an Anchorable that was in AutoHide mode.</summary>
-        /// <param name="anchor"><see cref="LayoutAnchorControl"/> to pop out of the side panel.</param>
-        internal void ShowAutoHideWindow(LayoutAnchorControl anchor)
-        {
-            _autoHideWindowManager.ShowAutoHideWindow(anchor);
-        }
-
-        internal void HideAutoHideWindow(LayoutAnchorControl anchor) => _autoHideWindowManager.HideAutoWindow(anchor);
-
-        internal FrameworkElement GetAutoHideAreaElement() => _autohideArea;
-
-        /// <summary>
-        /// Executes when the user starts to drag a <see cref="LayoutDocument"/> or
-        /// <see cref="LayoutAnchorable"/> by dragging its TabItem Header.
-        /// </summary>
-        /// <param name="contentModel"></param>
-        /// <param name="startDrag"></param>
-        internal void StartDraggingFloatingWindowForContent(LayoutContent contentModel, bool startDrag = true)
-        {
-            // Ensure window can float only if corresponding property is set accordingly
-            if (contentModel == null) return;
-            if (!contentModel.CanFloat) return;
-            LayoutFloatingWindowControl fwc = null;
-
-            // For last document re-use floating window
-            if (contentModel.Parent.ChildrenCount == 1)
-            {
-                foreach (var fw in _fwList)
-                {
-                    var found = fw.Model.Descendents().OfType<LayoutDocument>().Any(doc => doc == contentModel);
-                    if (!found) continue;
-                    if (fw.Model.Descendents().OfType<LayoutDocument>().Count() + fw.Model.Descendents().OfType<LayoutAnchorable>().Count() == 1)
-                        fwc = fw;
-                    break;
-                }
-            }
-
-            var show = fwc == null; // Do not show already visible floating window
-            if (fwc == null)
-                fwc = CreateFloatingWindow(contentModel, false);
-
-            if (fwc != null)
-            {
-                Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    // Activate only inactive document
-                    if (startDrag) fwc.AttachDrag();
-                    fwc.Show();
-                }), DispatcherPriority.Send);
-            }
-        }
-
-        /// <summary>
-        /// Executes when the user starts to drag a docked <see cref="LayoutAnchorable"/> (tool window)
-        /// by dragging its title bar (top header of a tool window).
-        /// </summary>
-        /// <param name="paneModel"></param>
-        internal void StartDraggingFloatingWindowForPane(LayoutAnchorablePane paneModel)
-        {
-            var fwc = CreateFloatingWindowForLayoutAnchorableWithoutParent(paneModel, false);
-            if (fwc == null) return;
-            fwc.AttachDrag();
-            fwc.Show();
-        }
-
-        internal IEnumerable<LayoutFloatingWindowControl> GetFloatingWindowsByZOrder()
-        {
-            var parentWindow = Window.GetWindow(this);
-            var windowParentHandle = parentWindow != null ? new WindowInteropHelper(parentWindow).Handle : Process.GetCurrentProcess().MainWindowHandle;
-            var currentHandle = Win32Helper.GetWindow(windowParentHandle, (uint)Win32Helper.GetWindow_Cmd.GW_HWNDFIRST);
-            while (currentHandle != IntPtr.Zero)
-            {
-                var ctrl = _fwList.FirstOrDefault(fw => new WindowInteropHelper(fw).Handle == currentHandle);
-                if (ctrl != null && ctrl.Model.Root != null && ctrl.Model.Root.Manager == this)
-                    yield return ctrl;
-
-                currentHandle = Win32Helper.GetWindow(currentHandle, (uint)Win32Helper.GetWindow_Cmd.GW_HWNDNEXT);
-            }
-        }
-
-        internal void RemoveFloatingWindow(LayoutFloatingWindowControl floatingWindow) => _fwList.Remove(floatingWindow);
-
-        internal void ExecuteCloseCommand(LayoutDocument document)
-        {
-            if (DocumentClosing != null)
-            {
-                var argsClosing = new DocumentClosingEventArgs(document);
-                DocumentClosing(this, argsClosing);
-                if (argsClosing.Cancel) return;
-            }
-            if (!document.CloseDocument()) return;
-            RemoveViewFromLogicalChild(document);
-            if (document.Content is UIElement uIElement)
-                RemoveLogicalChild(uIElement);
-            DocumentClosed?.Invoke(this, new DocumentClosedEventArgs(document));
-        }
-
-        internal void ExecuteCloseAllButThisCommand(LayoutContent contentSelected)
-        {
-            foreach (var contentToClose in Layout.Descendents().OfType<LayoutContent>().Where(d => d != contentSelected && (d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow)).ToArray())
-                Close(contentToClose);
-        }
-
-        internal void ExecuteCloseAllCommand(LayoutContent contentSelected)
-        {
-            foreach (var contentToClose in Layout.Descendents().OfType<LayoutContent>().Where(d => (d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow)).ToArray())
-                Close(contentToClose);
-        }
-
-        internal void ExecuteCloseCommand(LayoutAnchorable anchorable)
-        {
-            if (!(anchorable is LayoutAnchorable model)) return;
-            model.CloseAnchorable();
-            RemoveViewFromLogicalChild(anchorable);
-        }
-
-        internal void ExecuteHideCommand(LayoutAnchorable anchorable) => anchorable?.Hide();
-
-        internal void ExecuteAutoHideCommand(LayoutAnchorable _anchorable) => _anchorable.ToggleAutoHide();
-
-        /// <summary>
-        /// Method executes when the user clicks the Float button in the context menu of an <see cref="LayoutAnchorable"/>.
-        /// 
-        /// This removes the content from the docked <see cref="LayoutAnchorable"/> and inserts it into a
-        /// draggable <see cref="LayoutFloatingWindowControl"/>.
-        /// </summary>
-        /// <param name="contentToFloat"></param>
-        internal void ExecuteFloatCommand(LayoutContent contentToFloat) => contentToFloat.Float();
-
-        internal void ExecuteDockCommand(LayoutAnchorable anchorable) => anchorable.Dock();
-
-        internal void ExecuteDockAsDocumentCommand(LayoutContent content) => content.DockAsDocument();
-
-        internal void ExecuteContentActivateCommand(LayoutContent content) => content.IsActive = true;
-
-        #endregion Internal Methods
-
-        #region Overrides
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-            _autohideArea = GetTemplateChild("PART_AutoHideArea") as FrameworkElement;
-        }
-
-        protected override Size ArrangeOverride(Size arrangeBounds)
-        {
-            _areas = null;
-            return base.ArrangeOverride(arrangeBounds);
-        }
-
-        protected override void OnPreviewKeyDown(KeyEventArgs e)
-        {
-            if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
-            {
-                if (e.IsDown && e.Key == Key.Tab)
-                {
-                    if (!IsNavigatorWindowActive)
-                    {
-                        ShowNavigatorWindow();
-                        e.Handled = true;
-                    }
-                }
-            }
-
-            base.OnPreviewKeyDown(e);
-        }
-
-        #endregion Overrides
-
-        #region Private Methods
-
-        /// <summary>
-        /// OnContextMenuPropertyChanged(Fix ContextMenu's Resources is null,drop down menu style error)
-        /// </summary>
-        /// <param name="d"></param>
-        /// <param name="e"></param>
-        private static void OnContextMenuPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue is ContextMenu contextMenu)
-            {
-                contextMenu.Resources = ((DockingManager)d).Resources;
-            }
-        }
-
-        private void OnLayoutRootPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            switch (e.PropertyName)
-            {
-                case nameof(LayoutRoot.RootPanel):
-                    {
-                        if (IsInitialized)
-                        {
-                            var layoutRootPanel = CreateUIElementForModel(Layout.RootPanel) as LayoutPanelControl;
-                            LayoutRootPanel = layoutRootPanel;
-                        }
-                        break;
-                    }
-                case nameof(LayoutRoot.ActiveContent):
-                    {
-                        //set focus on active element only after a layout pass is completed
-                        //it's possible that it is not yet visible in the visual tree
-                        //if (_setFocusAsyncOperation == null)
-                        //{
-                        //    _setFocusAsyncOperation = Dispatcher.BeginInvoke(new Action(() =>
-                        // {
-                        if (Layout.ActiveContent != null)
-                            FocusElementManager.SetFocusOnLastElement(Layout.ActiveContent);
-                        //_setFocusAsyncOperation = null;
-                        //  } ), DispatcherPriority.Input );
-                        //}
-
-                        if (!_insideInternalSetActiveContent)
-                            ActiveContent = Layout.ActiveContent?.Content;
-                        break;
-                    }
-            }
-        }
-
-        private static void OnLayoutRootUpdated(object sender, EventArgs e) => CommandManager.InvalidateRequerySuggested();
-
-        private void OnLayoutChanging(LayoutRoot newLayout) => LayoutChanging?.Invoke(this, EventArgs.Empty);
-
-        private void DockingManager_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (DesignerProperties.GetIsInDesignMode(this)) return;
-            if (Layout.Manager == this)
-            {
-                LayoutRootPanel = CreateUIElementForModel(Layout.RootPanel) as LayoutPanelControl;
-                LeftSidePanel = CreateUIElementForModel(Layout.LeftSide) as LayoutAnchorSideControl;
-                TopSidePanel = CreateUIElementForModel(Layout.TopSide) as LayoutAnchorSideControl;
-                RightSidePanel = CreateUIElementForModel(Layout.RightSide) as LayoutAnchorSideControl;
-                BottomSidePanel = CreateUIElementForModel(Layout.BottomSide) as LayoutAnchorSideControl;
-
-                // In order to prevent resource leaks, unsubscribe from SizeChanged event for case when we have no stored Layout settings.
-                SizeChanged -= OnSizeChanged;
-                SizeChanged += OnSizeChanged;
-            }
-
-            SetupAutoHideWindow();
-
-            foreach (var fwc in _fwHiddenList)
-            {
-                fwc.EnableBindings();
-                if (fwc.KeepContentVisibleOnClose)
-                {
-                    fwc.Show();
-                    fwc.KeepContentVisibleOnClose = false;
-                }
-
-                _fwList.Add(fwc);
-            }
-            _fwHiddenList.Clear();
-
-            // load floating windows not already loaded! (issue #59)
-            var items = new List<LayoutFloatingWindow>(Layout.FloatingWindows.Where(fw => !_fwList.Any(fwc => fwc.Model == fw)));
-            foreach (var fw in items)
-                _fwList.Add(CreateUIElementForModel(fw) as LayoutFloatingWindowControl);
-
-            //create the overlaywindow if it's possible
-            if (IsVisible)
-                CreateOverlayWindow();
-            FocusElementManager.SetupFocusManagement(this);
-        }
-
-        /// <summary>Method executes when the <see cref="DockingManager"/> control has changed its height and/or width.</summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void OnSizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            // Lets make sure this always remains non-negative to avoid crach in layout system
-            var width = Math.Max(ActualWidth - GridSplitterWidth - RightSidePanel.ActualWidth - LeftSidePanel.ActualWidth, 0);
-            var height = Math.Max(ActualHeight - GridSplitterHeight - TopSidePanel.ActualHeight - BottomSidePanel.ActualHeight, 0);
-
-            LayoutRootPanel.AdjustFixedChildrenPanelSizes(new Size(width, height));
-        }
-
-        private void DockingManager_Unloaded(object sender, RoutedEventArgs e)
-        {
-            SizeChanged -= OnSizeChanged;
-
-            if (DesignerProperties.GetIsInDesignMode(this)) return;
-            _autoHideWindowManager?.HideAutoWindow();
-
-            AutoHideWindow?.Dispose();
-
-            foreach (var fw in _fwList.ToArray())
-            {
-                ////fw.Owner = null;
-                //fw.SetParentWindowToNull();
-                //fw.KeepContentVisibleOnClose = true;
-                //// To avoid calling Close method multiple times.
-                //fw.InternalClose(true);
-
-                // Unloaded can occure not only after closing of the application, but after switching between tabs.
-                // For such case it's better to hide the floating windows instead of closing it.
-                // We clear bindings on visibility during the owner is unloaded.
-                if (fw.IsVisible)
-                {
-                    fw.KeepContentVisibleOnClose = true;
-                    fw.Hide();
-                }
-                fw.DisableBindings();
-                _fwHiddenList.Add(fw);
-            }
-
-            _fwList.Clear();
-
-            DestroyOverlayWindow();
-            FocusElementManager.FinalizeFocusManagement(this);
-        }
-
-        private void SetupAutoHideWindow()
-        {
-            if (_autoHideWindowManager != null)
-                _autoHideWindowManager.HideAutoWindow();
-            else
-                _autoHideWindowManager = new AutoHideWindowManager(this);
-
-            AutoHideWindow?.Dispose();
-            SetAutoHideWindow(new LayoutAutoHideWindowControl());
-        }
-
-        private void CreateOverlayWindow()
-        {
-            if (_overlayWindow == null)
-                _overlayWindow = new OverlayWindow(this);
-            var rectWindow = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
-            _overlayWindow.Left = rectWindow.Left;
-            _overlayWindow.Top = rectWindow.Top;
-            _overlayWindow.Width = rectWindow.Width;
-            _overlayWindow.Height = rectWindow.Height;
-        }
-
-        private void DestroyOverlayWindow()
-        {
-            if (_overlayWindow == null) return;
-            _overlayWindow.Close();
-            _overlayWindow = null;
-        }
-
-        private void AttachDocumentsSource(LayoutRoot layout, IEnumerable documentsSource)
-        {
-            if (documentsSource == null) return;
-            if (layout == null) return;
-
-            //if (layout.Descendents().OfType<LayoutDocument>().Any())
-            //    throw new InvalidOperationException("Unable to set the DocumentsSource property if LayoutDocument objects are already present in the model");
-            var documentsImported = layout.Descendents().OfType<LayoutDocument>().Select(d => d.Content).ToArray();
-            var documents = documentsSource as IEnumerable;
-            var listOfDocumentsToImport = new List<object>(documents.OfType<object>());
-
-            foreach (var document in listOfDocumentsToImport.ToArray())
-            {
-                if (documentsImported.Contains(document))
-                    listOfDocumentsToImport.Remove(document);
-            }
-
-            LayoutDocumentPane documentPane = null;
-            if (layout.LastFocusedDocument != null)
-                documentPane = layout.LastFocusedDocument.Parent as LayoutDocumentPane;
-
-            if (documentPane == null)
-                documentPane = layout.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
-
-            //if (documentPane == null)
-            //    throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
-
-            _suspendLayoutItemCreation = true;
-            foreach (var documentContentToImport in listOfDocumentsToImport)
-            {
-                //documentPane.Children.Add(new LayoutDocument() { Content = documentToImport });
-                var documentToImport = new LayoutDocument { Content = documentContentToImport };
-
-                var added = false;
-                if (LayoutUpdateStrategy != null)
-                    added = LayoutUpdateStrategy.BeforeInsertDocument(layout, documentToImport, documentPane);
-
-                if (!added)
-                {
-                    if (documentPane == null)
-                        throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
-
-                    documentPane.Children.Add(documentToImport);
-                }
-
-                LayoutUpdateStrategy?.AfterInsertDocument(layout, documentToImport);
-                CreateDocumentLayoutItem(documentToImport);
-            }
-            _suspendLayoutItemCreation = false;
-            if (documentsSource is INotifyCollectionChanged documentsSourceAsNotifier)
-                documentsSourceAsNotifier.CollectionChanged += DocumentsSourceElementsChanged;
-        }
-
-        private void DocumentsSourceElementsChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (Layout == null) return;
-            //When deserializing documents are created automatically by the deserializer
-            if (SuspendDocumentsSourceBinding) return;
-
-            //handle remove
-            if (e.Action == NotifyCollectionChangedAction.Remove ||
-                e.Action == NotifyCollectionChangedAction.Replace)
-            {
-                if (e.OldItems != null)
-                {
-                    var documentsToRemove = Layout.Descendents().OfType<LayoutDocument>().Where(d => e.OldItems.Contains(d.Content)).ToArray();
-                    foreach (var documentToRemove in documentsToRemove)
-                    {
-                        documentToRemove.Parent.RemoveChild(documentToRemove);
-                        RemoveViewFromLogicalChild(documentToRemove);
-                    }
-                }
-            }
-
-            //handle add
-            if (e.NewItems != null && (e.Action == NotifyCollectionChangedAction.Add || e.Action == NotifyCollectionChangedAction.Replace))
-            {
-                if (e.NewItems != null)
-                {
-                    LayoutDocumentPane documentPane = null;
-                    if (Layout.LastFocusedDocument != null)
-                    {
-                        documentPane = Layout.LastFocusedDocument.Parent as LayoutDocumentPane;
-                    }
-                    if (documentPane == null)
-                    {
-                        documentPane = Layout.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
-                    }
-                    //if (documentPane == null)
-                    //    throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
-                    _suspendLayoutItemCreation = true;
-                    foreach (var documentContentToImport in e.NewItems)
-                    {
-                        var documentToImport = new LayoutDocument
-                        {
-                            Content = documentContentToImport
-                        };
-
-                        var added = false;
-                        if (LayoutUpdateStrategy != null)
-                        {
-                            added = LayoutUpdateStrategy.BeforeInsertDocument(Layout, documentToImport, documentPane);
-                        }
-
-                        if (!added)
-                        {
-                            if (documentPane == null)
-                                throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
-
-                            documentPane.Children.Add(documentToImport);
-                            added = true;
-                        }
-
-                        LayoutUpdateStrategy?.AfterInsertDocument(Layout, documentToImport);
-                        var root = documentToImport.Root;
-                        if (root != null && root.Manager == this)
-                        {
-                            CreateDocumentLayoutItem(documentToImport);
-                        }
-                    }
-                    _suspendLayoutItemCreation = false;
-                }
-            }
-
-            if (e.Action == NotifyCollectionChangedAction.Reset)
-            {
-                //NOTE: I'm going to clear every document present in layout but
-                //some documents may have been added directly to the layout, for now I clear them too
-                var documentsToRemove = Layout.Descendents().OfType<LayoutDocument>().ToArray();
-                foreach (var documentToRemove in documentsToRemove)
-                {
-                    (documentToRemove.Parent as ILayoutContainer).RemoveChild(
-                        documentToRemove);
-                    RemoveViewFromLogicalChild(documentToRemove);
-                }
-            }
-
-            Layout?.CollectGarbage();
-        }
-
-        private void DetachDocumentsSource(LayoutRoot layout, IEnumerable documentsSource)
-        {
-            if (documentsSource == null) return;
-            if (layout == null) return;
-
-            var documentsToRemove = layout.Descendents().OfType<LayoutDocument>()
-                .Where(d => documentsSource.Contains(d.Content)).ToArray();
-
-            foreach (var documentToRemove in documentsToRemove)
-            {
-                (documentToRemove.Parent as ILayoutContainer).RemoveChild(
-                    documentToRemove);
-                RemoveViewFromLogicalChild(documentToRemove);
-            }
-
-            if (documentsSource is INotifyCollectionChanged documentsSourceAsNotifier)
-                documentsSourceAsNotifier.CollectionChanged -= DocumentsSourceElementsChanged;
-        }
-
-        private void Close(LayoutContent contentToClose)
-        {
-            if (!contentToClose.CanClose) return;
-
-            var layoutItem = GetLayoutItemFromModel(contentToClose);
-            if (layoutItem.CloseCommand != null)
-            {
-                if (layoutItem.CloseCommand.CanExecute(null))
-                    layoutItem.CloseCommand.Execute(null);
-            }
-            else
-            {
-                if (contentToClose is LayoutDocument document)
-                    ExecuteCloseCommand(document);
-                else if (contentToClose is LayoutAnchorable anchorable)
-                    ExecuteCloseCommand(anchorable);
-            }
-        }
-
-        private void AttachAnchorablesSource(LayoutRoot layout, IEnumerable anchorablesSource)
-        {
-            if (anchorablesSource == null) return;
-            if (layout == null) return;
-
-            //if (layout.Descendents().OfType<LayoutAnchorable>().Any())
-            //    throw new InvalidOperationException("Unable to set the AnchorablesSource property if LayoutAnchorable objects are already present in the model");
-            var anchorablesImported = layout.Descendents().OfType<LayoutAnchorable>().Select(d => d.Content).ToArray();
-            var anchorables = anchorablesSource as IEnumerable;
-            var listOfAnchorablesToImport = new List<object>(anchorables.OfType<object>());
-
-            foreach (var document in listOfAnchorablesToImport.ToArray())
-            {
-                if (anchorablesImported.Contains(document))
-                    listOfAnchorablesToImport.Remove(document);
-            }
-            LayoutAnchorablePane anchorablePane = null;
-            if (layout.ActiveContent != null)
-            {
-                //look for active content parent pane
-                anchorablePane = layout.ActiveContent.Parent as LayoutAnchorablePane;
-            }
-            if (anchorablePane == null)
-            {
-                //look for a pane on the right side
-                anchorablePane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right);
-            }
-            if (anchorablePane == null)
-            {
-                //look for an available pane
-                anchorablePane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
-            }
-            _suspendLayoutItemCreation = true;
-            foreach (var anchorableContentToImport in listOfAnchorablesToImport)
-            {
-                var anchorableToImport = new LayoutAnchorable { Content = anchorableContentToImport };
-                var added = false;
-                if (LayoutUpdateStrategy != null)
-                    added = LayoutUpdateStrategy.BeforeInsertAnchorable(layout, anchorableToImport, anchorablePane);
-
-                if (!added)
-                {
-                    if (anchorablePane == null)
-                    {
-                        var mainLayoutPanel = new LayoutPanel { Orientation = Orientation.Horizontal };
-                        if (layout.RootPanel != null)
-                        {
-                            mainLayoutPanel.Children.Add(layout.RootPanel);
-                        }
-
-                        layout.RootPanel = mainLayoutPanel;
-                        anchorablePane = new LayoutAnchorablePane { DockWidth = new GridLength(200.0, GridUnitType.Pixel) };
-                        mainLayoutPanel.Children.Add(anchorablePane);
-                    }
-
-                    anchorablePane.Children.Add(anchorableToImport);
-                    added = true;
-                }
-
-                LayoutUpdateStrategy?.AfterInsertAnchorable(layout, anchorableToImport);
-                CreateAnchorableLayoutItem(anchorableToImport);
-            }
-            _suspendLayoutItemCreation = false;
-            if (anchorablesSource is INotifyCollectionChanged anchorablesSourceAsNotifier)
-                anchorablesSourceAsNotifier.CollectionChanged += AnchorablesSourceElementsChanged;
-        }
-
-        private void AnchorablesSourceElementsChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (Layout == null) return;
-
-            //When deserializing documents are created automatically by the deserializer
-            if (SuspendAnchorablesSourceBinding) return;
-
-            //handle remove
-            if (e.Action == NotifyCollectionChangedAction.Remove || e.Action == NotifyCollectionChangedAction.Replace)
-            {
-                if (e.OldItems != null)
-                {
-                    var anchorablesToRemove = Layout.Descendents().OfType<LayoutAnchorable>().Where(d => e.OldItems.Contains(d.Content)).ToArray();
-                    foreach (var anchorableToRemove in anchorablesToRemove)
-                    {
-                        anchorableToRemove.Content = null;
-                        anchorableToRemove.Parent.RemoveChild(anchorableToRemove);
-                        RemoveViewFromLogicalChild(anchorableToRemove);
-                    }
-                }
-            }
-
-            //handle add
-            if (e.NewItems != null && (e.Action == NotifyCollectionChangedAction.Add || e.Action == NotifyCollectionChangedAction.Replace))
-            {
-                if (e.NewItems != null)
-                {
-                    LayoutAnchorablePane anchorablePane = null;
-                    if (Layout.ActiveContent != null)
-                    {
-                        //look for active content parent pane
-                        anchorablePane = Layout.ActiveContent.Parent as LayoutAnchorablePane;
-                    }
-                    if (anchorablePane == null)
-                    {
-                        //look for a pane on the right side
-                        anchorablePane = Layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right);
-                    }
-                    if (anchorablePane == null)
-                    {
-                        //look for an available pane
-                        anchorablePane = Layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
-                    }
-                    _suspendLayoutItemCreation = true;
-                    foreach (var anchorableContentToImport in e.NewItems)
-                    {
-                        var anchorableToImport = new LayoutAnchorable { Content = anchorableContentToImport };
-                        var added = false;
-                        if (LayoutUpdateStrategy != null)
-                            added = LayoutUpdateStrategy.BeforeInsertAnchorable(Layout, anchorableToImport, anchorablePane);
-                        if (!added)
-                        {
-                            if (anchorablePane == null)
-                            {
-                                var mainLayoutPanel = new LayoutPanel { Orientation = Orientation.Horizontal };
-                                if (Layout.RootPanel != null)
-                                {
-                                    mainLayoutPanel.Children.Add(Layout.RootPanel);
-                                }
-                                Layout.RootPanel = mainLayoutPanel;
-                                anchorablePane = new LayoutAnchorablePane { DockWidth = new GridLength(200.0, GridUnitType.Pixel) };
-                                mainLayoutPanel.Children.Add(anchorablePane);
-                            }
-                            anchorablePane.Children.Add(anchorableToImport);
-                            added = true;
-                        }
-                        LayoutUpdateStrategy?.AfterInsertAnchorable(Layout, anchorableToImport);
-                        var root = anchorableToImport.Root;
-                        if (root != null && root.Manager == this)
-                            CreateAnchorableLayoutItem(anchorableToImport);
-                    }
-                    _suspendLayoutItemCreation = false;
-                }
-            }
-
-            if (e.Action == NotifyCollectionChangedAction.Reset)
-            {
-                //NOTE: I'm going to clear every anchorable present in layout but
-                //some anchorable may have been added directly to the layout, for now I clear them too
-                var anchorablesToRemove = Layout.Descendents().OfType<LayoutAnchorable>().ToArray();
-                foreach (var anchorableToRemove in anchorablesToRemove)
-                {
-                    (anchorableToRemove.Parent as ILayoutContainer).RemoveChild(
-                        anchorableToRemove);
-                    RemoveViewFromLogicalChild(anchorableToRemove);
-                }
-            }
-
-            Layout?.CollectGarbage();
-        }
-
-        private void DetachAnchorablesSource(LayoutRoot layout, IEnumerable anchorablesSource)
-        {
-            if (anchorablesSource == null) return;
-            if (layout == null) return;
-
-            var anchorablesToRemove = layout.Descendents().OfType<LayoutAnchorable>()
-                .Where(d => anchorablesSource.Contains(d.Content)).ToArray();
-
-            foreach (var anchorableToRemove in anchorablesToRemove)
-            {
-                anchorableToRemove.Parent.RemoveChild(anchorableToRemove);
-                RemoveViewFromLogicalChild(anchorableToRemove);
-            }
-
-            if (anchorablesSource is INotifyCollectionChanged anchorablesSourceAsNotifier)
-                anchorablesSourceAsNotifier.CollectionChanged -= AnchorablesSourceElementsChanged;
-        }
-
-        private void RemoveViewFromLogicalChild(LayoutContent layoutContent)
-        {
-            if (layoutContent == null) return;
-            var layoutItem = GetLayoutItemFromModel(layoutContent);
-            if (layoutItem == null) return;
-            if (layoutItem.IsViewExists()) InternalRemoveLogicalChild(layoutItem.View);
-        }
-
-        private void InternalSetActiveContent(object contentObject)
-        {
-            // BugFix for first issue in #59
-            var list = Layout.Descendents().OfType<LayoutContent>().ToList();
-            var layoutContent = list.FirstOrDefault(lc => lc == contentObject || lc.Content == contentObject);
-            _insideInternalSetActiveContent = true;
-            Layout.ActiveContent = layoutContent;
-            _insideInternalSetActiveContent = false;
-        }
-
-        #region LayoutItems
-        /// <summary>
-        /// Implements the EventHandler for the <see cref="LayoutRoot.ElementRemoved"/> event.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Layout_ElementRemoved(object sender, LayoutElementEventArgs e)
-        {
-            if (_suspendLayoutItemCreation) return;
-            CollectLayoutItemsDeleted();
-        }
-
-        /// <summary>
-        /// Implements the EventHandler for the <see cref="LayoutRoot.ElementAdded"/> event.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Layout_ElementAdded(object sender, LayoutElementEventArgs e)
-        {
-            if (_suspendLayoutItemCreation) return;
-            foreach (var content in Layout.Descendents().OfType<LayoutContent>().ToList())
-            {
-                if (content is LayoutDocument)
-                    CreateDocumentLayoutItem(content as LayoutDocument);
-                else //if (content is LayoutAnchorable)
-                    CreateAnchorableLayoutItem(content as LayoutAnchorable);
-            }
-            CollectLayoutItemsDeleted();
-        }
-
-        /// <summary>
-        /// Detach and remove all LayoutItems that are no longer part of the <see cref="LayoutRoot"/>.
-        /// </summary>
-        private void CollectLayoutItemsDeleted()
-        {
-            if (_collectLayoutItemsOperations != null) return;
-            _collectLayoutItemsOperations = Dispatcher.BeginInvoke(new Action(() =>
-            {
-                _collectLayoutItemsOperations = null;
-                foreach (var itemToRemove in _layoutItems.Where(item => item.LayoutElement.Root != Layout).ToArray())
-                {
-                    itemToRemove.Detach();
-                    _layoutItems.Remove(itemToRemove);
-                }
-            }));
-        }
-
-        /// <summary>
-        /// Detaches all LayoutItems from their content and clears the private collection of LayoutItems.
-        /// </summary>
-        private void DetachLayoutItems()
-        {
-            if (Layout == null) return;
-            _layoutItems.ForEach<LayoutItem>(i => i.Detach());
-            _layoutItems.Clear();
-            Layout.ElementAdded -= Layout_ElementAdded;
-            Layout.ElementRemoved -= Layout_ElementRemoved;
-        }
-
-        /// <summary>
-        /// Attaches a:
-        /// - <see cref="LayoutDocumentItem"/> to each <see cref="<see cref="LayoutDocumentItem"/> and
-        /// - <see cref="LayoutAnchorableItem"/> to each <see cref="<see cref="LayoutAnchorable"/>
-        /// 
-        /// in the <see cref="LayoutRoot"/> property.
-        /// </summary>
-        private void AttachLayoutItems()
-        {
-            if (Layout == null) return;
-            foreach (var document in Layout.Descendents().OfType<LayoutDocument>().ToArray())
-                CreateDocumentLayoutItem(document);
-
-            foreach (var anchorable in Layout.Descendents().OfType<LayoutAnchorable>().ToArray())
-                CreateAnchorableLayoutItem(anchorable);
-
-            Layout.ElementAdded += Layout_ElementAdded;
-            Layout.ElementRemoved += Layout_ElementRemoved;
-        }
-
-        /// <summary>
-        /// Applies the corresponding style to a <see cref="LayoutItem"/> either from:
-        /// 1) <see cref="LayoutItemContainerStyle"/> property or
-        /// 2) <see cref="LayoutItemContainerStyleSelector"/> property
-        /// </summary>
-        /// <param name="layoutItem"></param>
-        private void ApplyStyleToLayoutItem(LayoutItem layoutItem)
-        {
-            layoutItem._ClearDefaultBindings();
-            if (LayoutItemContainerStyle != null)
-                layoutItem.Style = LayoutItemContainerStyle;
-            else if (LayoutItemContainerStyleSelector != null)
-                layoutItem.Style = LayoutItemContainerStyleSelector.SelectStyle(layoutItem.Model, layoutItem);
-            layoutItem._SetDefaultBindings();
-        }
-
-        /// <summary>
-        /// Creates a <see cref="LayoutAnchorableItem"/> for each <see cref="LayoutAnchorable"/>
-        /// or returns the existing <see cref="LayoutAnchorableItem"/> if there is already one.
-        /// </summary>
-        /// <param name="contentToAttach"></param>
-        private void CreateAnchorableLayoutItem(LayoutAnchorable contentToAttach)
-        {
-            if (_layoutItems.Any(item => item.LayoutElement == contentToAttach))
-            {
-                foreach (var item in _layoutItems) ApplyStyleToLayoutItem(item);
-                return;
-            }
-
-            var layoutItem = new LayoutAnchorableItem();
-            layoutItem.Attach(contentToAttach);
-            _layoutItems.Add(layoutItem);
-            ApplyStyleToLayoutItem(layoutItem);
-            if (contentToAttach?.Content is UIElement) InternalAddLogicalChild(contentToAttach.Content);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="LayoutDocumentItem"/> for each <see cref="LayoutDocument"/>
-        /// or returns the existing <see cref="LayoutDocument"/> if there is already one.
-        /// </summary>
-        /// <param name="contentToAttach"></param>
-        private void CreateDocumentLayoutItem(LayoutDocument contentToAttach)
-        {
-            if (_layoutItems.Any(item => item.LayoutElement == contentToAttach))
-            {
-                foreach (var item in _layoutItems) ApplyStyleToLayoutItem(item);
-                return;
-            }
-
-            var layoutItem = new LayoutDocumentItem();
-            layoutItem.Attach(contentToAttach);
-            _layoutItems.Add(layoutItem);
-            ApplyStyleToLayoutItem(layoutItem);
-            if (contentToAttach?.Content is UIElement) InternalAddLogicalChild(contentToAttach.Content);
-        }
-        #endregion LayoutItems
-
-        private void ShowNavigatorWindow()
-        {
-            if (_navigatorWindow == null)
-                _navigatorWindow = new NavigatorWindow(this) { Owner = Window.GetWindow(this), WindowStartupLocation = WindowStartupLocation.CenterOwner };
-            _navigatorWindow.ShowDialog();
-            _navigatorWindow = null;
-        }
-
-        private LayoutFloatingWindowControl CreateFloatingWindowForLayoutAnchorableWithoutParent(LayoutAnchorablePane paneModel, bool isContentImmutable)
-        {
-            if (paneModel.Children.Any(c => !c.CanFloat))
-                return null;
-            var paneAsPositionableElement = paneModel as ILayoutPositionableElement;
-            var paneAsWithActualSize = paneModel as ILayoutPositionableElementWithActualSize;
-
-            var fwWidth = paneAsPositionableElement.FloatingWidth;
-            var fwHeight = paneAsPositionableElement.FloatingHeight;
-            var fwLeft = paneAsPositionableElement.FloatingLeft;
-            var fwTop = paneAsPositionableElement.FloatingTop;
-
-            if (fwWidth == 0.0)
-                fwWidth = paneAsWithActualSize.ActualWidth + 10;       //10 includes BorderThickness and Margins inside LayoutAnchorableFloatingWindowControl.
-            if (fwHeight == 0.0)
-                fwHeight = paneAsWithActualSize.ActualHeight + 10;   //10 includes BorderThickness and Margins inside LayoutAnchorableFloatingWindowControl.
-
-            var destPane = new LayoutAnchorablePane
-            {
-                DockWidth = paneAsPositionableElement.DockWidth,
-                DockHeight = paneAsPositionableElement.DockHeight,
-                DockMinHeight = paneAsPositionableElement.DockMinHeight,
-                DockMinWidth = paneAsPositionableElement.DockMinWidth,
-                FloatingLeft = paneAsPositionableElement.FloatingLeft,
-                FloatingTop = paneAsPositionableElement.FloatingTop,
-                FloatingWidth = paneAsPositionableElement.FloatingWidth,
-                FloatingHeight = paneAsPositionableElement.FloatingHeight,
-            };
-
-            var savePreviousContainer = paneModel.FindParent<LayoutFloatingWindow>() == null;
-            var currentSelectedContentIndex = paneModel.SelectedContentIndex;
-            while (paneModel.Children.Count > 0)
-            {
-                var contentModel = paneModel.Children[paneModel.Children.Count - 1];
-
-                if (savePreviousContainer)
-                {
-                    ((ILayoutPreviousContainer)contentModel).PreviousContainer = paneModel;
-                    contentModel.PreviousContainerIndex = paneModel.Children.Count - 1;
-                }
-
-                paneModel.RemoveChildAt(paneModel.Children.Count - 1);
-                destPane.Children.Insert(0, contentModel);
-            }
-
-            if (destPane.Children.Count > 0) destPane.SelectedContentIndex = currentSelectedContentIndex;
-            LayoutFloatingWindow fw;
-            LayoutFloatingWindowControl fwc;
-            fw = new LayoutAnchorableFloatingWindow
-            {
-                RootPanel = new LayoutAnchorablePaneGroup(destPane)
-                {
-                    DockHeight = destPane.DockHeight,
-                    DockWidth = destPane.DockWidth,
-                    DockMinHeight = destPane.DockMinHeight,
-                    DockMinWidth = destPane.DockMinWidth,
-                }
-            };
-
-            Layout.FloatingWindows.Add(fw);
-
-            fwc = new LayoutAnchorableFloatingWindowControl((LayoutAnchorableFloatingWindow)fw, isContentImmutable)
-            {
-                Width = fwWidth,
-                Height = fwHeight,
-                Top = fwTop,
-                Left = fwLeft
-            };
-            //fwc.Owner = Window.GetWindow(this);
-            //fwc.SetParentToMainWindowOf(this);
-            _fwList.Add(fwc);
-            Layout.CollectGarbage();
-            InvalidateArrange();
-            return fwc;
-        }
-
-        private LayoutFloatingWindowControl CreateFloatingWindowCore(LayoutContent contentModel, bool isContentImmutable)
-        {
-            if (!contentModel.CanFloat) return null;
-            if (contentModel is LayoutAnchorable contentModelAsAnchorable && contentModelAsAnchorable.IsAutoHidden)
-                contentModelAsAnchorable.ToggleAutoHide();
-
-            var parentPane = contentModel.Parent as ILayoutPane;
-            var parentPaneAsPositionableElement = contentModel.Parent as ILayoutPositionableElement;
-            var parentPaneAsWithActualSize = contentModel.Parent as ILayoutPositionableElementWithActualSize;
-            var contentModelParentChildrenIndex = parentPane.Children.ToList().IndexOf(contentModel);
-
-            if (contentModel.FindParent<LayoutFloatingWindow>() == null)
-            {
-                ((ILayoutPreviousContainer)contentModel).PreviousContainer = parentPane;
-                contentModel.PreviousContainerIndex = contentModelParentChildrenIndex;
-            }
-
-            parentPane.RemoveChildAt(contentModelParentChildrenIndex);
-
-            var fwWidth = contentModel.FloatingWidth;
-            var fwHeight = contentModel.FloatingHeight;
-
-            if (fwWidth == 0.0)
-                fwWidth = parentPaneAsPositionableElement.FloatingWidth;
-            if (fwHeight == 0.0)
-                fwHeight = parentPaneAsPositionableElement.FloatingHeight;
-
-            if (fwWidth == 0.0)
-                fwWidth = parentPaneAsWithActualSize.ActualWidth + 10;      //10 includes BorderThickness and Margins inside LayoutDocumentFloatingWindowControl.
-            if (fwHeight == 0.0)
-                fwHeight = parentPaneAsWithActualSize.ActualHeight + 10;    //10 includes BorderThickness and Margins inside LayoutDocumentFloatingWindowControl.
-
-            LayoutFloatingWindow fw;
-            LayoutFloatingWindowControl fwc;
-            if (contentModel is LayoutAnchorable)
-            {
-                var anchorableContent = contentModel as LayoutAnchorable;
-                fw = new LayoutAnchorableFloatingWindow
-                {
-                    RootPanel = new LayoutAnchorablePaneGroup(new LayoutAnchorablePane(anchorableContent)
-                    {
-                        DockWidth = parentPaneAsPositionableElement.DockWidth,
-                        DockHeight = parentPaneAsPositionableElement.DockHeight,
-                        DockMinHeight = parentPaneAsPositionableElement.DockMinHeight,
-                        DockMinWidth = parentPaneAsPositionableElement.DockMinWidth,
-                        FloatingLeft = parentPaneAsPositionableElement.FloatingLeft,
-                        FloatingTop = parentPaneAsPositionableElement.FloatingTop,
-                        FloatingWidth = parentPaneAsPositionableElement.FloatingWidth,
-                        FloatingHeight = parentPaneAsPositionableElement.FloatingHeight,
-                    })
-                };
-
-                Layout.FloatingWindows.Add(fw);
-                fwc = new LayoutAnchorableFloatingWindowControl((LayoutAnchorableFloatingWindow)fw, isContentImmutable)
-                {
-                    Width = fwWidth,
-                    Height = fwHeight,
-                    Left = contentModel.FloatingLeft,
-                    Top = contentModel.FloatingTop
-                };
-            }
-            else
-            {
-                var anchorableDocument = contentModel as LayoutDocument;
-                fw = new LayoutDocumentFloatingWindow
-                {
-                    RootPanel = new LayoutDocumentPaneGroup(new LayoutDocumentPane(anchorableDocument)
-                    {
-                        DockWidth = parentPaneAsPositionableElement.DockWidth,
-                        DockHeight = parentPaneAsPositionableElement.DockHeight,
-                        DockMinHeight = parentPaneAsPositionableElement.DockMinHeight,
-                        DockMinWidth = parentPaneAsPositionableElement.DockMinWidth,
-                        FloatingLeft = parentPaneAsPositionableElement.FloatingLeft,
-                        FloatingTop = parentPaneAsPositionableElement.FloatingTop,
-                        FloatingWidth = parentPaneAsPositionableElement.FloatingWidth,
-                        FloatingHeight = parentPaneAsPositionableElement.FloatingHeight,
-                    })
-                };
-
-                Layout.FloatingWindows.Add(fw);
-                fwc = new LayoutDocumentFloatingWindowControl((LayoutDocumentFloatingWindow)fw, isContentImmutable)
-                {
-                    Width = fwWidth,
-                    Height = fwHeight,
-                    Left = contentModel.FloatingLeft,
-                    Top = contentModel.FloatingTop
-                };
-            }
-            //fwc.Owner = Window.GetWindow(this);
-            //fwc.SetParentToMainWindowOf(this);
-            _fwList.Add(fwc);
-            Layout.CollectGarbage();
-            UpdateLayout();
-            return fwc;
-        }
-
-        #endregion Private Methods
-    }
-}
+			if (_logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).Contains(element))
+				return;
+
+			_logicalChildren.Add(new WeakReference(element));
+			AddLogicalChild(element);
+		}
+
+		internal void InternalRemoveLogicalChild(object element)
+		{
+			var wrToRemove = _logicalChildren.FirstOrDefault(ch => ch.GetValueOrDefault<object>() == element);
+			if (wrToRemove != null)
+				_logicalChildren.Remove(wrToRemove);
+			RemoveLogicalChild(element);
+		}
+
+		private void ClearLogicalChildrenList()
+		{
+			foreach (var child in _logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).ToArray())
+				RemoveLogicalChild(child);
+			_logicalChildren.Clear();
+		}
+
+		#endregion LogicalChildren
+
+		#region Private Properties
+
+		private bool IsNavigatorWindowActive => _navigatorWindow != null;
+
+		#endregion Private Properties
+
+		#region IOverlayWindowHost Interface
+
+		/// <inheritdoc/>
+		bool IOverlayWindowHost.HitTest(Point dragPoint)
+		{
+			try
+			{
+				var detectionRect = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
+				return detectionRect.Contains(dragPoint);
+			}
+			catch
+			{
+				// Silently swallow exception that may occur if DockingManager is not visible (because its hidden by a tab)
+			}
+
+			return false;
+		}
+
+		/// <inheritdoc/>
+		DockingManager IOverlayWindowHost.Manager => this;
+
+		/// <inheritdoc/>
+		IOverlayWindow IOverlayWindowHost.ShowOverlayWindow(LayoutFloatingWindowControl draggingWindow)
+		{
+			CreateOverlayWindow();
+			_overlayWindow.Owner = draggingWindow;
+			_overlayWindow.EnableDropTargets();
+			_overlayWindow.Show();
+			return _overlayWindow;
+		}
+
+		/// <inheritdoc/>
+		void IOverlayWindowHost.HideOverlayWindow()
+		{
+			_areas = null;
+			_overlayWindow.Owner = null;
+			_overlayWindow.HideDropTargets();
+		}
+
+		/// <inheritdoc/>
+		IEnumerable<IDropArea> IOverlayWindowHost.GetDropAreas(LayoutFloatingWindowControl draggingWindow)
+		{
+			if (_areas != null) return _areas;
+			_areas = new List<IDropArea>();
+			var isDraggingDocuments = draggingWindow.Model is LayoutDocumentFloatingWindow;
+			if (!isDraggingDocuments)
+			{
+				_areas.Add(new DropArea<DockingManager>(this, DropAreaType.DockingManager));
+				foreach (var areaHost in this.FindVisualChildren<LayoutAnchorablePaneControl>())
+					if (areaHost.Model.Descendents().Any()) _areas.Add(new DropArea<LayoutAnchorablePaneControl>(areaHost, DropAreaType.AnchorablePane));
+			}
+
+			// Determine if floatingWindow is configured to dock as document or not
+			var dockAsDocument = true;
+			if (!isDraggingDocuments)
+			{
+				if (draggingWindow.Model is LayoutAnchorableFloatingWindow toolWindow)
+				{
+					foreach (var item in GetAnchorableInFloatingWindow(draggingWindow))
+					{
+						if (item.CanDockAsTabbedDocument != false) continue;
+						dockAsDocument = false;
+						break;
+					}
+				}
+			}
+
+			// Dock only documents and tools in DocumentPane if configuration does allow that
+			if (dockAsDocument)
+			{
+				foreach (var areaHost in this.FindVisualChildren<LayoutDocumentPaneControl>())
+					_areas.Add(new DropArea<LayoutDocumentPaneControl>(areaHost, DropAreaType.DocumentPane));
+			}
+
+			foreach (var areaHost in this.FindVisualChildren<LayoutDocumentPaneGroupControl>())
+			{
+				var documentGroupModel = areaHost.Model as LayoutDocumentPaneGroup;
+				if (!documentGroupModel.Children.Any(c => c.IsVisible))
+					_areas.Add(new DropArea<LayoutDocumentPaneGroupControl>(areaHost, DropAreaType.DocumentPaneGroup));
+			}
+
+			return _areas;
+		}
+
+		/// <summary>
+		/// Finds all <see cref="LayoutAnchorable"/> objects (tool windows) within a
+		/// <see cref="LayoutFloatingWindow"/> (if any) and return them.
+		/// </summary>
+		/// <param name="draggingWindow"></param>
+		/// <returns></returns>
+		private IEnumerable<LayoutAnchorable> GetAnchorableInFloatingWindow(LayoutFloatingWindowControl draggingWindow)
+		{
+			if (!(draggingWindow.Model is LayoutAnchorableFloatingWindow layoutAnchorableFloatingWindow)) yield break;
+			//big part of code for getting type
+
+			if (layoutAnchorableFloatingWindow.SinglePane is LayoutAnchorablePane layoutAnchorablePane && (layoutAnchorableFloatingWindow.IsSinglePane && layoutAnchorablePane.SelectedContent != null))
+			{
+				var layoutAnchorable = ((LayoutAnchorablePane)layoutAnchorableFloatingWindow.SinglePane).SelectedContent as LayoutAnchorable;
+				yield return layoutAnchorable;
+			}
+			else
+				foreach (var item in GetLayoutAnchorable(layoutAnchorableFloatingWindow.RootPanel))
+					yield return item;
+		}
+
+		/// <summary>
+		/// Finds all <see cref="LayoutAnchorable"/> objects (toolwindows) within a
+		/// <see cref="LayoutAnchorablePaneGroup"/> (if any) and return them.
+		/// </summary>
+		/// <param name="layoutAnchPaneGroup"></param>
+		/// <returns>All the anchorable items found.</returns>
+		/// <seealso cref="LayoutAnchorable"/>
+		/// <seealso cref="LayoutAnchorablePaneGroup"/>
+		internal IEnumerable<LayoutAnchorable> GetLayoutAnchorable(LayoutAnchorablePaneGroup layoutAnchPaneGroup)
+		{
+			if (layoutAnchPaneGroup == null) yield break;
+			foreach (var anchorable in layoutAnchPaneGroup.Descendents().OfType<LayoutAnchorable>())
+				yield return anchorable;
+		}
+
+		#endregion IOverlayWindowHost Interface
+
+		#region Public Methods
+
+		/// <summary>Return the LayoutItem wrapper for the content passed as argument.</summary>
+		/// <param name="content">LayoutContent to search</param>
+		/// <returns>Either a <see cref="LayoutAnchorableItem"/> or <see cref="LayoutDocumentItem"/> which contains the <see cref="LayoutContent"/> passed as argument.</returns>
+		public LayoutItem GetLayoutItemFromModel(LayoutContent content)
+		{
+			return _layoutItems.FirstOrDefault(item => item.LayoutElement == content);
+		}
+
+		public LayoutFloatingWindowControl CreateFloatingWindow(LayoutContent contentModel, bool isContentImmutable)
+		{
+			if (contentModel is LayoutAnchorable anchorable)
+			{
+				if (!(contentModel.Parent is ILayoutPane))
+				{
+					var pane = new LayoutAnchorablePane(anchorable)
+					{
+						FloatingTop = contentModel.FloatingTop,
+						FloatingLeft = contentModel.FloatingLeft,
+						FloatingWidth = contentModel.FloatingWidth,
+						FloatingHeight = contentModel.FloatingHeight
+					};
+					_ = CreateFloatingWindowForLayoutAnchorableWithoutParent(pane, isContentImmutable);
+				}
+			}
+
+			return CreateFloatingWindowCore(contentModel, isContentImmutable);
+		}
+
+		#endregion Public Methods
+
+		#region Internal Methods
+
+		/// <summary>
+		/// Method is invoked to create the actual visible UI element from a given layout model. It is invoked when:
+		///
+		/// 1. New UI items are created and layed out or
+		/// 2. Layout is deserialized, and the previous UI items are restored to the screen
+		///    (using the model who's information was serialized to XML).
+		/// </summary>
+		/// <param name="model">The layout element.</param>
+		/// <returns></returns>
+		internal UIElement CreateUIElementForModel(ILayoutElement model)
+		{
+			if (model is LayoutPanel)
+				return new LayoutPanelControl(model as LayoutPanel);
+			if (model is LayoutAnchorablePaneGroup)
+				return new LayoutAnchorablePaneGroupControl(model as LayoutAnchorablePaneGroup);
+			if (model is LayoutDocumentPaneGroup)
+				return new LayoutDocumentPaneGroupControl(model as LayoutDocumentPaneGroup);
+
+			if (model is LayoutAnchorSide)
+			{
+				var templateModelView = new LayoutAnchorSideControl(model as LayoutAnchorSide);
+				templateModelView.SetBinding(TemplateProperty, new Binding(AnchorSideTemplateProperty.Name) { Source = this });
+				return templateModelView;
+			}
+			if (model is LayoutAnchorGroup)
+			{
+				var templateModelView = new LayoutAnchorGroupControl(model as LayoutAnchorGroup);
+				templateModelView.SetBinding(TemplateProperty, new Binding(AnchorGroupTemplateProperty.Name) { Source = this });
+				return templateModelView;
+			}
+
+			if (model is LayoutDocumentPane)
+			{
+				var templateModelView = new LayoutDocumentPaneControl(model as LayoutDocumentPane, IsVirtualizingDocument);
+				templateModelView.SetBinding(StyleProperty, new Binding(DocumentPaneControlStyleProperty.Name) { Source = this });
+				return templateModelView;
+			}
+			if (model is LayoutAnchorablePane)
+			{
+				var templateModelView = new LayoutAnchorablePaneControl(model as LayoutAnchorablePane, IsVirtualizingAnchorable);
+				templateModelView.SetBinding(StyleProperty, new Binding(AnchorablePaneControlStyleProperty.Name) { Source = this });
+				return templateModelView;
+			}
+
+			if (model is LayoutAnchorableFloatingWindow)
+			{
+				if (DesignerProperties.GetIsInDesignMode(this)) return null;
+				var modelFW = model as LayoutAnchorableFloatingWindow;
+				var newFW = new LayoutAnchorableFloatingWindowControl(modelFW)
+				{
+					//Owner = Window.GetWindow(this)
+				};
+				newFW.SetParentToMainWindowOf(this);
+
+				// Floating Window can also contain only Pane Groups at its base (issue #27) so we check for
+				// RootPanel (which is a LayoutAnchorablePaneGroup) and make sure the window is positioned back
+				// in current (or nearest) monitor
+				var panegroup = modelFW.RootPanel;
+				if (panegroup != null)
+				{
+					panegroup.KeepInsideNearestMonitor();  // Check position is valid in current setup
+
+					newFW.Left = panegroup.FloatingLeft;   // Position the window to previous or nearest valid position
+					newFW.Top = panegroup.FloatingTop;
+					newFW.Width = panegroup.FloatingWidth;
+					newFW.Height = panegroup.FloatingHeight;
+				}
+
+				newFW.ShowInTaskbar = false;
+
+				Dispatcher.BeginInvoke(new Action(() =>
+				{
+					if (newFW.Content != null || (newFW.Model as LayoutAnchorableFloatingWindow)?.IsVisible == true)
+						newFW.Show();
+					else
+						newFW.Hide();
+				}), DispatcherPriority.Send);
+
+				if (panegroup != null && panegroup.IsMaximized)
+					newFW.WindowState = WindowState.Maximized;
+				return newFW;
+			}
+
+			if (model is LayoutDocumentFloatingWindow)
+			{
+				if (DesignerProperties.GetIsInDesignMode(this))
+					return null;
+				var modelFW = model as LayoutDocumentFloatingWindow;
+				var newFW = new LayoutDocumentFloatingWindowControl(modelFW)
+				{
+					//Owner = Window.GetWindow(this)
+				};
+				newFW.SetParentToMainWindowOf(this);
+
+				var paneForExtensions = modelFW.RootPanel;
+				if (paneForExtensions != null)
+				{
+					//ensure that floating window position is inside current (or nearest) monitor
+					paneForExtensions.KeepInsideNearestMonitor();
+
+					newFW.Left = paneForExtensions.FloatingLeft;
+					newFW.Top = paneForExtensions.FloatingTop;
+					newFW.Width = paneForExtensions.FloatingWidth;
+					newFW.Height = paneForExtensions.FloatingHeight;
+				}
+				newFW.ShowInTaskbar = false;
+				newFW.Show();
+				// Do not set the WindowState before showing or it will be lost
+				if (paneForExtensions != null && paneForExtensions.IsMaximized)
+					newFW.WindowState = WindowState.Maximized;
+				return newFW;
+			}
+			if (model is LayoutDocument layoutDocument)
+			{
+				var templateModelView = new LayoutDocumentControl { Model = layoutDocument };
+				return templateModelView;
+			}
+			return null;
+		}
+
+		/// <summary>Method is invoked to pop put an Anchorable that was in AutoHide mode.</summary>
+		/// <param name="anchor"><see cref="LayoutAnchorControl"/> to pop out of the side panel.</param>
+		internal void ShowAutoHideWindow(LayoutAnchorControl anchor)
+		{
+			_autoHideWindowManager.ShowAutoHideWindow(anchor);
+		}
+
+		internal void HideAutoHideWindow(LayoutAnchorControl anchor) => _autoHideWindowManager.HideAutoWindow(anchor);
+
+		internal FrameworkElement GetAutoHideAreaElement() => _autohideArea;
+
+		/// <summary>
+		/// Executes when the user starts to drag a <see cref="LayoutDocument"/> or
+		/// <see cref="LayoutAnchorable"/> by dragging its TabItem Header.
+		/// </summary>
+		/// <param name="contentModel"></param>
+		/// <param name="startDrag"></param>
+		internal void StartDraggingFloatingWindowForContent(LayoutContent contentModel, bool startDrag = true)
+		{
+			// Ensure window can float only if corresponding property is set accordingly
+			if (contentModel == null) return;
+			if (!contentModel.CanFloat) return;
+			LayoutFloatingWindowControl fwc = null;
+
+			// For last document re-use floating window
+			if (contentModel.Parent.ChildrenCount == 1)
+			{
+				foreach (var fw in _fwList)
+				{
+					var found = fw.Model.Descendents().OfType<LayoutDocument>().Any(doc => doc == contentModel);
+					if (!found) continue;
+					if (fw.Model.Descendents().OfType<LayoutDocument>().Count() + fw.Model.Descendents().OfType<LayoutAnchorable>().Count() == 1)
+						fwc = fw;
+					break;
+				}
+			}
+
+			var show = fwc == null; // Do not show already visible floating window
+			if (fwc == null)
+				fwc = CreateFloatingWindow(contentModel, false);
+
+			if (fwc != null)
+			{
+				Dispatcher.BeginInvoke(new Action(() =>
+				{
+					// Activate only inactive document
+					if (startDrag) fwc.AttachDrag();
+					fwc.Show();
+				}), DispatcherPriority.Send);
+			}
+		}
+
+		/// <summary>
+		/// Executes when the user starts to drag a docked <see cref="LayoutAnchorable"/> (tool window)
+		/// by dragging its title bar (top header of a tool window).
+		/// </summary>
+		/// <param name="paneModel"></param>
+		internal void StartDraggingFloatingWindowForPane(LayoutAnchorablePane paneModel)
+		{
+			var fwc = CreateFloatingWindowForLayoutAnchorableWithoutParent(paneModel, false);
+			if (fwc == null) return;
+			fwc.AttachDrag();
+			fwc.Show();
+		}
+
+		internal IEnumerable<LayoutFloatingWindowControl> GetFloatingWindowsByZOrder()
+		{
+			var parentWindow = Window.GetWindow(this);
+			var windowParentHandle = parentWindow != null ? new WindowInteropHelper(parentWindow).Handle : Process.GetCurrentProcess().MainWindowHandle;
+			var currentHandle = Win32Helper.GetWindow(windowParentHandle, (uint)Win32Helper.GetWindow_Cmd.GW_HWNDFIRST);
+			while (currentHandle != IntPtr.Zero)
+			{
+				var ctrl = _fwList.FirstOrDefault(fw => new WindowInteropHelper(fw).Handle == currentHandle);
+				if (ctrl != null && ctrl.Model.Root != null && ctrl.Model.Root.Manager == this)
+					yield return ctrl;
+
+				currentHandle = Win32Helper.GetWindow(currentHandle, (uint)Win32Helper.GetWindow_Cmd.GW_HWNDNEXT);
+			}
+		}
+
+		internal void RemoveFloatingWindow(LayoutFloatingWindowControl floatingWindow) => _fwList.Remove(floatingWindow);
+
+		internal void ExecuteCloseCommand(LayoutDocument document)
+		{
+			if (DocumentClosing != null)
+			{
+				var argsClosing = new DocumentClosingEventArgs(document);
+				DocumentClosing(this, argsClosing);
+				if (argsClosing.Cancel) return;
+			}
+			if (!document.CloseDocument()) return;
+			RemoveViewFromLogicalChild(document);
+			if (document.Content is UIElement uIElement)
+				RemoveLogicalChild(uIElement);
+			DocumentClosed?.Invoke(this, new DocumentClosedEventArgs(document));
+		}
+
+		internal void ExecuteCloseAllButThisCommand(LayoutContent contentSelected)
+		{
+			foreach (var contentToClose in Layout.Descendents().OfType<LayoutContent>().Where(d => d != contentSelected && (d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow)).ToArray())
+				Close(contentToClose);
+		}
+
+		internal void ExecuteCloseAllCommand(LayoutContent contentSelected)
+		{
+			foreach (var contentToClose in Layout.Descendents().OfType<LayoutContent>().Where(d => (d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow)).ToArray())
+				Close(contentToClose);
+		}
+
+		internal void ExecuteCloseCommand(LayoutAnchorable anchorable)
+		{
+			if (!(anchorable is LayoutAnchorable model)) return;
+			model.CloseAnchorable();
+			RemoveViewFromLogicalChild(anchorable);
+		}
+
+		internal void ExecuteHideCommand(LayoutAnchorable anchorable) => anchorable?.Hide();
+
+		internal void ExecuteAutoHideCommand(LayoutAnchorable _anchorable) => _anchorable.ToggleAutoHide();
+
+		/// <summary>
+		/// Method executes when the user clicks the Float button in the context menu of an <see cref="LayoutAnchorable"/>.
+		///
+		/// This removes the content from the docked <see cref="LayoutAnchorable"/> and inserts it into a
+		/// draggable <see cref="LayoutFloatingWindowControl"/>.
+		/// </summary>
+		/// <param name="contentToFloat"></param>
+		internal void ExecuteFloatCommand(LayoutContent contentToFloat) => contentToFloat.Float();
+
+		internal void ExecuteDockCommand(LayoutAnchorable anchorable) => anchorable.Dock();
+
+		internal void ExecuteDockAsDocumentCommand(LayoutContent content) => content.DockAsDocument();
+
+		internal void ExecuteContentActivateCommand(LayoutContent content) => content.IsActive = true;
+
+		#endregion Internal Methods
+
+		#region Overrides
+
+		public override void OnApplyTemplate()
+		{
+			base.OnApplyTemplate();
+			_autohideArea = GetTemplateChild("PART_AutoHideArea") as FrameworkElement;
+		}
+
+		protected override Size ArrangeOverride(Size arrangeBounds)
+		{
+			_areas = null;
+			return base.ArrangeOverride(arrangeBounds);
+		}
+
+		protected override void OnPreviewKeyDown(KeyEventArgs e)
+		{
+			if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
+			{
+				if (e.IsDown && e.Key == Key.Tab)
+				{
+					if (!IsNavigatorWindowActive)
+					{
+						ShowNavigatorWindow();
+						e.Handled = true;
+					}
+				}
+			}
+
+			base.OnPreviewKeyDown(e);
+		}
+
+		#endregion Overrides
+
+		#region Private Methods
+
+		/// <summary>
+		/// OnContextMenuPropertyChanged(Fix ContextMenu's Resources is null,drop down menu style error)
+		/// </summary>
+		/// <param name="d"></param>
+		/// <param name="e"></param>
+		private static void OnContextMenuPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		{
+			if (e.NewValue is ContextMenu contextMenu)
+			{
+				contextMenu.Resources = ((DockingManager)d).Resources;
+			}
+		}
+
+		private void OnLayoutRootPropertyChanged(object sender, PropertyChangedEventArgs e)
+		{
+			switch (e.PropertyName)
+			{
+				case nameof(LayoutRoot.RootPanel):
+					{
+						if (IsInitialized)
+						{
+							var layoutRootPanel = CreateUIElementForModel(Layout.RootPanel) as LayoutPanelControl;
+							LayoutRootPanel = layoutRootPanel;
+						}
+						break;
+					}
+				case nameof(LayoutRoot.ActiveContent):
+					{
+						//set focus on active element only after a layout pass is completed
+						//it's possible that it is not yet visible in the visual tree
+						//if (_setFocusAsyncOperation == null)
+						//{
+						//    _setFocusAsyncOperation = Dispatcher.BeginInvoke(new Action(() =>
+						// {
+						if (Layout.ActiveContent != null)
+							FocusElementManager.SetFocusOnLastElement(Layout.ActiveContent);
+						//_setFocusAsyncOperation = null;
+						//  } ), DispatcherPriority.Input );
+						//}
+
+						if (!_insideInternalSetActiveContent)
+							ActiveContent = Layout.ActiveContent?.Content;
+						break;
+					}
+			}
+		}
+
+		private static void OnLayoutRootUpdated(object sender, EventArgs e) => CommandManager.InvalidateRequerySuggested();
+
+		private void OnLayoutChanging(LayoutRoot newLayout) => LayoutChanging?.Invoke(this, EventArgs.Empty);
+
+		private void DockingManager_Loaded(object sender, RoutedEventArgs e)
+		{
+			if (DesignerProperties.GetIsInDesignMode(this)) return;
+			if (Layout.Manager == this)
+			{
+				LayoutRootPanel = CreateUIElementForModel(Layout.RootPanel) as LayoutPanelControl;
+				LeftSidePanel = CreateUIElementForModel(Layout.LeftSide) as LayoutAnchorSideControl;
+				TopSidePanel = CreateUIElementForModel(Layout.TopSide) as LayoutAnchorSideControl;
+				RightSidePanel = CreateUIElementForModel(Layout.RightSide) as LayoutAnchorSideControl;
+				BottomSidePanel = CreateUIElementForModel(Layout.BottomSide) as LayoutAnchorSideControl;
+
+				// In order to prevent resource leaks, unsubscribe from SizeChanged event for case when we have no stored Layout settings.
+				SizeChanged -= OnSizeChanged;
+				SizeChanged += OnSizeChanged;
+			}
+
+			SetupAutoHideWindow();
+
+			foreach (var fwc in _fwHiddenList)
+			{
+				fwc.EnableBindings();
+				if (fwc.KeepContentVisibleOnClose)
+				{
+					fwc.Show();
+					fwc.KeepContentVisibleOnClose = false;
+				}
+
+				_fwList.Add(fwc);
+			}
+			_fwHiddenList.Clear();
+
+			// load floating windows not already loaded! (issue #59)
+			var items = new List<LayoutFloatingWindow>(Layout.FloatingWindows.Where(fw => !_fwList.Any(fwc => fwc.Model == fw)));
+			foreach (var fw in items)
+				_fwList.Add(CreateUIElementForModel(fw) as LayoutFloatingWindowControl);
+
+			//create the overlaywindow if it's possible
+			if (IsVisible)
+				CreateOverlayWindow();
+			FocusElementManager.SetupFocusManagement(this);
+		}
+
+		/// <summary>Method executes when the <see cref="DockingManager"/> control has changed its height and/or width.</summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void OnSizeChanged(object sender, SizeChangedEventArgs e)
+		{
+			// Lets make sure this always remains non-negative to avoid crach in layout system
+			var width = Math.Max(ActualWidth - GridSplitterWidth - RightSidePanel.ActualWidth - LeftSidePanel.ActualWidth, 0);
+			var height = Math.Max(ActualHeight - GridSplitterHeight - TopSidePanel.ActualHeight - BottomSidePanel.ActualHeight, 0);
+
+			LayoutRootPanel.AdjustFixedChildrenPanelSizes(new Size(width, height));
+		}
+
+		private void DockingManager_Unloaded(object sender, RoutedEventArgs e)
+		{
+			SizeChanged -= OnSizeChanged;
+
+			if (DesignerProperties.GetIsInDesignMode(this)) return;
+			_autoHideWindowManager?.HideAutoWindow();
+
+			AutoHideWindow?.Dispose();
+
+			foreach (var fw in _fwList.ToArray())
+			{
+				////fw.Owner = null;
+				//fw.SetParentWindowToNull();
+				//fw.KeepContentVisibleOnClose = true;
+				//// To avoid calling Close method multiple times.
+				//fw.InternalClose(true);
+
+				// Unloaded can occure not only after closing of the application, but after switching between tabs.
+				// For such case it's better to hide the floating windows instead of closing it.
+				// We clear bindings on visibility during the owner is unloaded.
+				if (fw.IsVisible)
+				{
+					fw.KeepContentVisibleOnClose = true;
+					fw.Hide();
+				}
+				fw.DisableBindings();
+				_fwHiddenList.Add(fw);
+			}
+
+			_fwList.Clear();
+
+			DestroyOverlayWindow();
+			FocusElementManager.FinalizeFocusManagement(this);
+		}
+
+		private void SetupAutoHideWindow()
+		{
+			if (_autoHideWindowManager != null)
+				_autoHideWindowManager.HideAutoWindow();
+			else
+				_autoHideWindowManager = new AutoHideWindowManager(this);
+
+			AutoHideWindow?.Dispose();
+			SetAutoHideWindow(new LayoutAutoHideWindowControl());
+		}
+
+		private void CreateOverlayWindow()
+		{
+			if (_overlayWindow == null)
+				_overlayWindow = new OverlayWindow(this);
+			var rectWindow = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
+			_overlayWindow.Left = rectWindow.Left;
+			_overlayWindow.Top = rectWindow.Top;
+			_overlayWindow.Width = rectWindow.Width;
+			_overlayWindow.Height = rectWindow.Height;
+		}
+
+		private void DestroyOverlayWindow()
+		{
+			if (_overlayWindow == null) return;
+			_overlayWindow.Close();
+			_overlayWindow = null;
+		}
+
+		private void AttachDocumentsSource(LayoutRoot layout, IEnumerable documentsSource)
+		{
+			if (documentsSource == null) return;
+			if (layout == null) return;
+
+			//if (layout.Descendents().OfType<LayoutDocument>().Any())
+			//    throw new InvalidOperationException("Unable to set the DocumentsSource property if LayoutDocument objects are already present in the model");
+			var documentsImported = layout.Descendents().OfType<LayoutDocument>().Select(d => d.Content).ToArray();
+			var documents = documentsSource as IEnumerable;
+			var listOfDocumentsToImport = new List<object>(documents.OfType<object>());
+
+			foreach (var document in listOfDocumentsToImport.ToArray())
+			{
+				if (documentsImported.Contains(document))
+					listOfDocumentsToImport.Remove(document);
+			}
+
+			LayoutDocumentPane documentPane = null;
+			if (layout.LastFocusedDocument != null)
+				documentPane = layout.LastFocusedDocument.Parent as LayoutDocumentPane;
+
+			if (documentPane == null)
+				documentPane = layout.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
+
+			//if (documentPane == null)
+			//    throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
+
+			_suspendLayoutItemCreation = true;
+			foreach (var documentContentToImport in listOfDocumentsToImport)
+			{
+				//documentPane.Children.Add(new LayoutDocument() { Content = documentToImport });
+				var documentToImport = new LayoutDocument { Content = documentContentToImport };
+
+				var added = false;
+				if (LayoutUpdateStrategy != null)
+					added = LayoutUpdateStrategy.BeforeInsertDocument(layout, documentToImport, documentPane);
+
+				if (!added)
+				{
+					if (documentPane == null)
+						throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
+
+					documentPane.Children.Add(documentToImport);
+				}
+
+				LayoutUpdateStrategy?.AfterInsertDocument(layout, documentToImport);
+				CreateDocumentLayoutItem(documentToImport);
+			}
+			_suspendLayoutItemCreation = false;
+			if (documentsSource is INotifyCollectionChanged documentsSourceAsNotifier)
+				documentsSourceAsNotifier.CollectionChanged += DocumentsSourceElementsChanged;
+		}
+
+		private void DocumentsSourceElementsChanged(object sender, NotifyCollectionChangedEventArgs e)
+		{
+			if (Layout == null) return;
+			//When deserializing documents are created automatically by the deserializer
+			if (SuspendDocumentsSourceBinding) return;
+
+			//handle remove
+			if (e.Action == NotifyCollectionChangedAction.Remove ||
+				e.Action == NotifyCollectionChangedAction.Replace)
+			{
+				if (e.OldItems != null)
+				{
+					var documentsToRemove = Layout.Descendents().OfType<LayoutDocument>().Where(d => e.OldItems.Contains(d.Content)).ToArray();
+					foreach (var documentToRemove in documentsToRemove)
+					{
+						documentToRemove.Parent.RemoveChild(documentToRemove);
+						RemoveViewFromLogicalChild(documentToRemove);
+					}
+				}
+			}
+
+			//handle add
+			if (e.NewItems != null && (e.Action == NotifyCollectionChangedAction.Add || e.Action == NotifyCollectionChangedAction.Replace))
+			{
+				if (e.NewItems != null)
+				{
+					LayoutDocumentPane documentPane = null;
+					if (Layout.LastFocusedDocument != null)
+					{
+						documentPane = Layout.LastFocusedDocument.Parent as LayoutDocumentPane;
+					}
+					if (documentPane == null)
+					{
+						documentPane = Layout.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
+					}
+					//if (documentPane == null)
+					//    throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
+					_suspendLayoutItemCreation = true;
+					foreach (var documentContentToImport in e.NewItems)
+					{
+						var documentToImport = new LayoutDocument
+						{
+							Content = documentContentToImport
+						};
+
+						var added = false;
+						if (LayoutUpdateStrategy != null)
+						{
+							added = LayoutUpdateStrategy.BeforeInsertDocument(Layout, documentToImport, documentPane);
+						}
+
+						if (!added)
+						{
+							if (documentPane == null)
+								throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
+
+							documentPane.Children.Add(documentToImport);
+							added = true;
+						}
+
+						LayoutUpdateStrategy?.AfterInsertDocument(Layout, documentToImport);
+						var root = documentToImport.Root;
+						if (root != null && root.Manager == this)
+						{
+							CreateDocumentLayoutItem(documentToImport);
+						}
+					}
+					_suspendLayoutItemCreation = false;
+				}
+			}
+
+			if (e.Action == NotifyCollectionChangedAction.Reset)
+			{
+				//NOTE: I'm going to clear every document present in layout but
+				//some documents may have been added directly to the layout, for now I clear them too
+				var documentsToRemove = Layout.Descendents().OfType<LayoutDocument>().ToArray();
+				foreach (var documentToRemove in documentsToRemove)
+				{
+					(documentToRemove.Parent as ILayoutContainer).RemoveChild(
+						documentToRemove);
+					RemoveViewFromLogicalChild(documentToRemove);
+				}
+			}
+
+			Layout?.CollectGarbage();
+		}
+
+		private void DetachDocumentsSource(LayoutRoot layout, IEnumerable documentsSource)
+		{
+			if (documentsSource == null) return;
+			if (layout == null) return;
+
+			var documentsToRemove = layout.Descendents().OfType<LayoutDocument>()
+				.Where(d => documentsSource.Contains(d.Content)).ToArray();
+
+			foreach (var documentToRemove in documentsToRemove)
+			{
+				(documentToRemove.Parent as ILayoutContainer).RemoveChild(
+					documentToRemove);
+				RemoveViewFromLogicalChild(documentToRemove);
+			}
+
+			if (documentsSource is INotifyCollectionChanged documentsSourceAsNotifier)
+				documentsSourceAsNotifier.CollectionChanged -= DocumentsSourceElementsChanged;
+		}
+
+		private void Close(LayoutContent contentToClose)
+		{
+			if (!contentToClose.CanClose) return;
+
+			var layoutItem = GetLayoutItemFromModel(contentToClose);
+			if (layoutItem.CloseCommand != null)
+			{
+				if (layoutItem.CloseCommand.CanExecute(null))
+					layoutItem.CloseCommand.Execute(null);
+			}
+			else
+			{
+				if (contentToClose is LayoutDocument document)
+					ExecuteCloseCommand(document);
+				else if (contentToClose is LayoutAnchorable anchorable)
+					ExecuteCloseCommand(anchorable);
+			}
+		}
+
+		private void AttachAnchorablesSource(LayoutRoot layout, IEnumerable anchorablesSource)
+		{
+			if (anchorablesSource == null) return;
+			if (layout == null) return;
+
+			//if (layout.Descendents().OfType<LayoutAnchorable>().Any())
+			//    throw new InvalidOperationException("Unable to set the AnchorablesSource property if LayoutAnchorable objects are already present in the model");
+			var anchorablesImported = layout.Descendents().OfType<LayoutAnchorable>().Select(d => d.Content).ToArray();
+			var anchorables = anchorablesSource as IEnumerable;
+			var listOfAnchorablesToImport = new List<object>(anchorables.OfType<object>());
+
+			foreach (var document in listOfAnchorablesToImport.ToArray())
+			{
+				if (anchorablesImported.Contains(document))
+					listOfAnchorablesToImport.Remove(document);
+			}
+			LayoutAnchorablePane anchorablePane = null;
+			if (layout.ActiveContent != null)
+			{
+				//look for active content parent pane
+				anchorablePane = layout.ActiveContent.Parent as LayoutAnchorablePane;
+			}
+			if (anchorablePane == null)
+			{
+				//look for a pane on the right side
+				anchorablePane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right);
+			}
+			if (anchorablePane == null)
+			{
+				//look for an available pane
+				anchorablePane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
+			}
+			_suspendLayoutItemCreation = true;
+			foreach (var anchorableContentToImport in listOfAnchorablesToImport)
+			{
+				var anchorableToImport = new LayoutAnchorable { Content = anchorableContentToImport };
+				var added = false;
+				if (LayoutUpdateStrategy != null)
+					added = LayoutUpdateStrategy.BeforeInsertAnchorable(layout, anchorableToImport, anchorablePane);
+
+				if (!added)
+				{
+					if (anchorablePane == null)
+					{
+						var mainLayoutPanel = new LayoutPanel { Orientation = Orientation.Horizontal };
+						if (layout.RootPanel != null)
+						{
+							mainLayoutPanel.Children.Add(layout.RootPanel);
+						}
+
+						layout.RootPanel = mainLayoutPanel;
+						anchorablePane = new LayoutAnchorablePane { DockWidth = new GridLength(200.0, GridUnitType.Pixel) };
+						mainLayoutPanel.Children.Add(anchorablePane);
+					}
+
+					anchorablePane.Children.Add(anchorableToImport);
+					added = true;
+				}
+
+				LayoutUpdateStrategy?.AfterInsertAnchorable(layout, anchorableToImport);
+				CreateAnchorableLayoutItem(anchorableToImport);
+			}
+			_suspendLayoutItemCreation = false;
+			if (anchorablesSource is INotifyCollectionChanged anchorablesSourceAsNotifier)
+				anchorablesSourceAsNotifier.CollectionChanged += AnchorablesSourceElementsChanged;
+		}
+
+		private void AnchorablesSourceElementsChanged(object sender, NotifyCollectionChangedEventArgs e)
+		{
+			if (Layout == null) return;
+
+			//When deserializing documents are created automatically by the deserializer
+			if (SuspendAnchorablesSourceBinding) return;
+
+			//handle remove
+			if (e.Action == NotifyCollectionChangedAction.Remove || e.Action == NotifyCollectionChangedAction.Replace)
+			{
+				if (e.OldItems != null)
+				{
+					var anchorablesToRemove = Layout.Descendents().OfType<LayoutAnchorable>().Where(d => e.OldItems.Contains(d.Content)).ToArray();
+					foreach (var anchorableToRemove in anchorablesToRemove)
+					{
+						anchorableToRemove.Content = null;
+						anchorableToRemove.Parent.RemoveChild(anchorableToRemove);
+						RemoveViewFromLogicalChild(anchorableToRemove);
+					}
+				}
+			}
+
+			//handle add
+			if (e.NewItems != null && (e.Action == NotifyCollectionChangedAction.Add || e.Action == NotifyCollectionChangedAction.Replace))
+			{
+				if (e.NewItems != null)
+				{
+					LayoutAnchorablePane anchorablePane = null;
+					if (Layout.ActiveContent != null)
+					{
+						//look for active content parent pane
+						anchorablePane = Layout.ActiveContent.Parent as LayoutAnchorablePane;
+					}
+					if (anchorablePane == null)
+					{
+						//look for a pane on the right side
+						anchorablePane = Layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right);
+					}
+					if (anchorablePane == null)
+					{
+						//look for an available pane
+						anchorablePane = Layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
+					}
+					_suspendLayoutItemCreation = true;
+					foreach (var anchorableContentToImport in e.NewItems)
+					{
+						var anchorableToImport = new LayoutAnchorable { Content = anchorableContentToImport };
+						var added = false;
+						if (LayoutUpdateStrategy != null)
+							added = LayoutUpdateStrategy.BeforeInsertAnchorable(Layout, anchorableToImport, anchorablePane);
+						if (!added)
+						{
+							if (anchorablePane == null)
+							{
+								var mainLayoutPanel = new LayoutPanel { Orientation = Orientation.Horizontal };
+								if (Layout.RootPanel != null)
+								{
+									mainLayoutPanel.Children.Add(Layout.RootPanel);
+								}
+								Layout.RootPanel = mainLayoutPanel;
+								anchorablePane = new LayoutAnchorablePane { DockWidth = new GridLength(200.0, GridUnitType.Pixel) };
+								mainLayoutPanel.Children.Add(anchorablePane);
+							}
+							anchorablePane.Children.Add(anchorableToImport);
+							added = true;
+						}
+						LayoutUpdateStrategy?.AfterInsertAnchorable(Layout, anchorableToImport);
+						var root = anchorableToImport.Root;
+						if (root != null && root.Manager == this)
+							CreateAnchorableLayoutItem(anchorableToImport);
+					}
+					_suspendLayoutItemCreation = false;
+				}
+			}
+
+			if (e.Action == NotifyCollectionChangedAction.Reset)
+			{
+				//NOTE: I'm going to clear every anchorable present in layout but
+				//some anchorable may have been added directly to the layout, for now I clear them too
+				var anchorablesToRemove = Layout.Descendents().OfType<LayoutAnchorable>().ToArray();
+				foreach (var anchorableToRemove in anchorablesToRemove)
+				{
+					(anchorableToRemove.Parent as ILayoutContainer).RemoveChild(
+						anchorableToRemove);
+					RemoveViewFromLogicalChild(anchorableToRemove);
+				}
+			}
+
+			Layout?.CollectGarbage();
+		}
+
+		private void DetachAnchorablesSource(LayoutRoot layout, IEnumerable anchorablesSource)
+		{
+			if (anchorablesSource == null) return;
+			if (layout == null) return;
+
+			var anchorablesToRemove = layout.Descendents().OfType<LayoutAnchorable>()
+				.Where(d => anchorablesSource.Contains(d.Content)).ToArray();
+
+			foreach (var anchorableToRemove in anchorablesToRemove)
+			{
+				anchorableToRemove.Parent.RemoveChild(anchorableToRemove);
+				RemoveViewFromLogicalChild(anchorableToRemove);
+			}
+
+			if (anchorablesSource is INotifyCollectionChanged anchorablesSourceAsNotifier)
+				anchorablesSourceAsNotifier.CollectionChanged -= AnchorablesSourceElementsChanged;
+		}
+
+		private void RemoveViewFromLogicalChild(LayoutContent layoutContent)
+		{
+			if (layoutContent == null) return;
+			var layoutItem = GetLayoutItemFromModel(layoutContent);
+			if (layoutItem == null) return;
+			if (layoutItem.IsViewExists()) InternalRemoveLogicalChild(layoutItem.View);
+		}
+
+		private void InternalSetActiveContent(object contentObject)
+		{
+			// BugFix for first issue in #59
+			var list = Layout.Descendents().OfType<LayoutContent>().ToList();
+			var layoutContent = list.FirstOrDefault(lc => lc == contentObject || lc.Content == contentObject);
+			_insideInternalSetActiveContent = true;
+			Layout.ActiveContent = layoutContent;
+			_insideInternalSetActiveContent = false;
+		}
+
+		#region LayoutItems
+
+		/// <summary>
+		/// Implements the EventHandler for the <see cref="LayoutRoot.ElementRemoved"/> event.
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void Layout_ElementRemoved(object sender, LayoutElementEventArgs e)
+		{
+			if (_suspendLayoutItemCreation) return;
+			CollectLayoutItemsDeleted();
+		}
+
+		/// <summary>
+		/// Implements the EventHandler for the <see cref="LayoutRoot.ElementAdded"/> event.
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void Layout_ElementAdded(object sender, LayoutElementEventArgs e)
+		{
+			if (_suspendLayoutItemCreation) return;
+			foreach (var content in Layout.Descendents().OfType<LayoutContent>().ToList())
+			{
+				if (content is LayoutDocument)
+					CreateDocumentLayoutItem(content as LayoutDocument);
+				else //if (content is LayoutAnchorable)
+					CreateAnchorableLayoutItem(content as LayoutAnchorable);
+			}
+			CollectLayoutItemsDeleted();
+		}
+
+		/// <summary>
+		/// Detach and remove all LayoutItems that are no longer part of the <see cref="LayoutRoot"/>.
+		/// </summary>
+		private void CollectLayoutItemsDeleted()
+		{
+			if (_collectLayoutItemsOperations != null) return;
+			_collectLayoutItemsOperations = Dispatcher.BeginInvoke(new Action(() =>
+			{
+				_collectLayoutItemsOperations = null;
+				foreach (var itemToRemove in _layoutItems.Where(item => item.LayoutElement.Root != Layout).ToArray())
+				{
+					itemToRemove.Detach();
+					_layoutItems.Remove(itemToRemove);
+				}
+			}));
+		}
+
+		/// <summary>
+		/// Detaches all LayoutItems from their content and clears the private collection of LayoutItems.
+		/// </summary>
+		private void DetachLayoutItems()
+		{
+			if (Layout == null) return;
+			_layoutItems.ForEach<LayoutItem>(i => i.Detach());
+			_layoutItems.Clear();
+			Layout.ElementAdded -= Layout_ElementAdded;
+			Layout.ElementRemoved -= Layout_ElementRemoved;
+		}
+
+		/// <summary>
+		/// Attaches a:
+		/// - <see cref="LayoutDocumentItem"/> to each <see cref="<see cref="LayoutDocumentItem"/> and
+		/// - <see cref="LayoutAnchorableItem"/> to each <see cref="<see cref="LayoutAnchorable"/>
+		///
+		/// in the <see cref="LayoutRoot"/> property.
+		/// </summary>
+		private void AttachLayoutItems()
+		{
+			if (Layout == null) return;
+			foreach (var document in Layout.Descendents().OfType<LayoutDocument>().ToArray())
+				CreateDocumentLayoutItem(document);
+
+			foreach (var anchorable in Layout.Descendents().OfType<LayoutAnchorable>().ToArray())
+				CreateAnchorableLayoutItem(anchorable);
+
+			Layout.ElementAdded += Layout_ElementAdded;
+			Layout.ElementRemoved += Layout_ElementRemoved;
+		}
+
+		/// <summary>
+		/// Applies the corresponding style to a <see cref="LayoutItem"/> either from:
+		/// 1) <see cref="LayoutItemContainerStyle"/> property or
+		/// 2) <see cref="LayoutItemContainerStyleSelector"/> property
+		/// </summary>
+		/// <param name="layoutItem"></param>
+		private void ApplyStyleToLayoutItem(LayoutItem layoutItem)
+		{
+			layoutItem._ClearDefaultBindings();
+			if (LayoutItemContainerStyle != null)
+				layoutItem.Style = LayoutItemContainerStyle;
+			else if (LayoutItemContainerStyleSelector != null)
+				layoutItem.Style = LayoutItemContainerStyleSelector.SelectStyle(layoutItem.Model, layoutItem);
+			layoutItem._SetDefaultBindings();
+		}
+
+		/// <summary>
+		/// Creates a <see cref="LayoutAnchorableItem"/> for each <see cref="LayoutAnchorable"/>
+		/// or returns the existing <see cref="LayoutAnchorableItem"/> if there is already one.
+		/// </summary>
+		/// <param name="contentToAttach"></param>
+		private void CreateAnchorableLayoutItem(LayoutAnchorable contentToAttach)
+		{
+			if (_layoutItems.Any(item => item.LayoutElement == contentToAttach))
+			{
+				foreach (var item in _layoutItems) ApplyStyleToLayoutItem(item);
+				return;
+			}
+
+			var layoutItem = new LayoutAnchorableItem();
+			layoutItem.Attach(contentToAttach);
+			_layoutItems.Add(layoutItem);
+			ApplyStyleToLayoutItem(layoutItem);
+			if (contentToAttach?.Content is UIElement) InternalAddLogicalChild(contentToAttach.Content);
+		}
+
+		/// <summary>
+		/// Creates a <see cref="LayoutDocumentItem"/> for each <see cref="LayoutDocument"/>
+		/// or returns the existing <see cref="LayoutDocument"/> if there is already one.
+		/// </summary>
+		/// <param name="contentToAttach"></param>
+		private void CreateDocumentLayoutItem(LayoutDocument contentToAttach)
+		{
+			if (_layoutItems.Any(item => item.LayoutElement == contentToAttach))
+			{
+				foreach (var item in _layoutItems) ApplyStyleToLayoutItem(item);
+				return;
+			}
+
+			var layoutItem = new LayoutDocumentItem();
+			layoutItem.Attach(contentToAttach);
+			_layoutItems.Add(layoutItem);
+			ApplyStyleToLayoutItem(layoutItem);
+			if (contentToAttach?.Content is UIElement) InternalAddLogicalChild(contentToAttach.Content);
+		}
+
+		#endregion LayoutItems
+
+		private void ShowNavigatorWindow()
+		{
+			if (_navigatorWindow == null)
+				_navigatorWindow = new NavigatorWindow(this) { Owner = Window.GetWindow(this), WindowStartupLocation = WindowStartupLocation.CenterOwner };
+			_navigatorWindow.ShowDialog();
+			_navigatorWindow = null;
+		}
+
+		private LayoutFloatingWindowControl CreateFloatingWindowForLayoutAnchorableWithoutParent(LayoutAnchorablePane paneModel, bool isContentImmutable)
+		{
+			if (paneModel.Children.Any(c => !c.CanFloat))
+				return null;
+			var paneAsPositionableElement = paneModel as ILayoutPositionableElement;
+			var paneAsWithActualSize = paneModel as ILayoutPositionableElementWithActualSize;
+
+			var fwWidth = paneAsPositionableElement.FloatingWidth;
+			var fwHeight = paneAsPositionableElement.FloatingHeight;
+			var fwLeft = paneAsPositionableElement.FloatingLeft;
+			var fwTop = paneAsPositionableElement.FloatingTop;
+
+			if (fwWidth == 0.0)
+				fwWidth = paneAsWithActualSize.ActualWidth + 10;       //10 includes BorderThickness and Margins inside LayoutAnchorableFloatingWindowControl.
+			if (fwHeight == 0.0)
+				fwHeight = paneAsWithActualSize.ActualHeight + 10;   //10 includes BorderThickness and Margins inside LayoutAnchorableFloatingWindowControl.
+
+			var destPane = new LayoutAnchorablePane
+			{
+				DockWidth = paneAsPositionableElement.DockWidth,
+				DockHeight = paneAsPositionableElement.DockHeight,
+				DockMinHeight = paneAsPositionableElement.DockMinHeight,
+				DockMinWidth = paneAsPositionableElement.DockMinWidth,
+				FloatingLeft = paneAsPositionableElement.FloatingLeft,
+				FloatingTop = paneAsPositionableElement.FloatingTop,
+				FloatingWidth = paneAsPositionableElement.FloatingWidth,
+				FloatingHeight = paneAsPositionableElement.FloatingHeight,
+			};
+
+			var savePreviousContainer = paneModel.FindParent<LayoutFloatingWindow>() == null;
+			var currentSelectedContentIndex = paneModel.SelectedContentIndex;
+			while (paneModel.Children.Count > 0)
+			{
+				var contentModel = paneModel.Children[paneModel.Children.Count - 1];
+
+				if (savePreviousContainer)
+				{
+					((ILayoutPreviousContainer)contentModel).PreviousContainer = paneModel;
+					contentModel.PreviousContainerIndex = paneModel.Children.Count - 1;
+				}
+
+				paneModel.RemoveChildAt(paneModel.Children.Count - 1);
+				destPane.Children.Insert(0, contentModel);
+			}
+
+			if (destPane.Children.Count > 0) destPane.SelectedContentIndex = currentSelectedContentIndex;
+			LayoutFloatingWindow fw;
+			LayoutFloatingWindowControl fwc;
+			fw = new LayoutAnchorableFloatingWindow
+			{
+				RootPanel = new LayoutAnchorablePaneGroup(destPane)
+				{
+					DockHeight = destPane.DockHeight,
+					DockWidth = destPane.DockWidth,
+					DockMinHeight = destPane.DockMinHeight,
+					DockMinWidth = destPane.DockMinWidth,
+				}
+			};
+
+			Layout.FloatingWindows.Add(fw);
+
+			fwc = new LayoutAnchorableFloatingWindowControl((LayoutAnchorableFloatingWindow)fw, isContentImmutable)
+			{
+				Width = fwWidth,
+				Height = fwHeight,
+				Top = fwTop,
+				Left = fwLeft
+			};
+			//fwc.Owner = Window.GetWindow(this);
+			//fwc.SetParentToMainWindowOf(this);
+			_fwList.Add(fwc);
+			Layout.CollectGarbage();
+			InvalidateArrange();
+			return fwc;
+		}
+
+		private LayoutFloatingWindowControl CreateFloatingWindowCore(LayoutContent contentModel, bool isContentImmutable)
+		{
+			if (!contentModel.CanFloat) return null;
+			if (contentModel is LayoutAnchorable contentModelAsAnchorable && contentModelAsAnchorable.IsAutoHidden)
+				contentModelAsAnchorable.ToggleAutoHide();
+
+			var parentPane = contentModel.Parent as ILayoutPane;
+			var parentPaneAsPositionableElement = contentModel.Parent as ILayoutPositionableElement;
+			var parentPaneAsWithActualSize = contentModel.Parent as ILayoutPositionableElementWithActualSize;
+			var contentModelParentChildrenIndex = parentPane.Children.ToList().IndexOf(contentModel);
+
+			if (contentModel.FindParent<LayoutFloatingWindow>() == null)
+			{
+				((ILayoutPreviousContainer)contentModel).PreviousContainer = parentPane;
+				contentModel.PreviousContainerIndex = contentModelParentChildrenIndex;
+			}
+
+			parentPane.RemoveChildAt(contentModelParentChildrenIndex);
+
+			var fwWidth = contentModel.FloatingWidth;
+			var fwHeight = contentModel.FloatingHeight;
+
+			if (fwWidth == 0.0)
+				fwWidth = parentPaneAsPositionableElement.FloatingWidth;
+			if (fwHeight == 0.0)
+				fwHeight = parentPaneAsPositionableElement.FloatingHeight;
+
+			if (fwWidth == 0.0)
+				fwWidth = parentPaneAsWithActualSize.ActualWidth + 10;      //10 includes BorderThickness and Margins inside LayoutDocumentFloatingWindowControl.
+			if (fwHeight == 0.0)
+				fwHeight = parentPaneAsWithActualSize.ActualHeight + 10;    //10 includes BorderThickness and Margins inside LayoutDocumentFloatingWindowControl.
+
+			LayoutFloatingWindow fw;
+			LayoutFloatingWindowControl fwc;
+			if (contentModel is LayoutAnchorable)
+			{
+				var anchorableContent = contentModel as LayoutAnchorable;
+				fw = new LayoutAnchorableFloatingWindow
+				{
+					RootPanel = new LayoutAnchorablePaneGroup(new LayoutAnchorablePane(anchorableContent)
+					{
+						DockWidth = parentPaneAsPositionableElement.DockWidth,
+						DockHeight = parentPaneAsPositionableElement.DockHeight,
+						DockMinHeight = parentPaneAsPositionableElement.DockMinHeight,
+						DockMinWidth = parentPaneAsPositionableElement.DockMinWidth,
+						FloatingLeft = parentPaneAsPositionableElement.FloatingLeft,
+						FloatingTop = parentPaneAsPositionableElement.FloatingTop,
+						FloatingWidth = parentPaneAsPositionableElement.FloatingWidth,
+						FloatingHeight = parentPaneAsPositionableElement.FloatingHeight,
+					})
+				};
+
+				Layout.FloatingWindows.Add(fw);
+				fwc = new LayoutAnchorableFloatingWindowControl((LayoutAnchorableFloatingWindow)fw, isContentImmutable)
+				{
+					Width = fwWidth,
+					Height = fwHeight,
+					Left = contentModel.FloatingLeft,
+					Top = contentModel.FloatingTop
+				};
+			}
+			else
+			{
+				var anchorableDocument = contentModel as LayoutDocument;
+				fw = new LayoutDocumentFloatingWindow
+				{
+					RootPanel = new LayoutDocumentPaneGroup(new LayoutDocumentPane(anchorableDocument)
+					{
+						DockWidth = parentPaneAsPositionableElement.DockWidth,
+						DockHeight = parentPaneAsPositionableElement.DockHeight,
+						DockMinHeight = parentPaneAsPositionableElement.DockMinHeight,
+						DockMinWidth = parentPaneAsPositionableElement.DockMinWidth,
+						FloatingLeft = parentPaneAsPositionableElement.FloatingLeft,
+						FloatingTop = parentPaneAsPositionableElement.FloatingTop,
+						FloatingWidth = parentPaneAsPositionableElement.FloatingWidth,
+						FloatingHeight = parentPaneAsPositionableElement.FloatingHeight,
+					})
+				};
+
+				Layout.FloatingWindows.Add(fw);
+				fwc = new LayoutDocumentFloatingWindowControl((LayoutDocumentFloatingWindow)fw, isContentImmutable)
+				{
+					Width = fwWidth,
+					Height = fwHeight,
+					Left = contentModel.FloatingLeft,
+					Top = contentModel.FloatingTop
+				};
+			}
+			//fwc.Owner = Window.GetWindow(this);
+			//fwc.SetParentToMainWindowOf(this);
+			_fwList.Add(fwc);
+			Layout.CollectGarbage();
+			UpdateLayout();
+			return fwc;
+		}
+
+		#endregion Private Methods
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/DocumentClosedEventArgs.cs b/source/Components/AvalonDock/DocumentClosedEventArgs.cs
index e2402088..95b0abf6 100644
--- a/source/Components/AvalonDock/DocumentClosedEventArgs.cs
+++ b/source/Components/AvalonDock/DocumentClosedEventArgs.cs
@@ -7,8 +7,8 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
-using System;
 using AvalonDock.Layout;
+using System;
 
 namespace AvalonDock
 {
@@ -32,4 +32,4 @@ public DocumentClosedEventArgs(LayoutDocument document)
 		/// </summary>
 		public LayoutDocument Document { get; private set; }
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/DocumentClosingEventArgs.cs b/source/Components/AvalonDock/DocumentClosingEventArgs.cs
index ef785ee2..956bb7c0 100644
--- a/source/Components/AvalonDock/DocumentClosingEventArgs.cs
+++ b/source/Components/AvalonDock/DocumentClosingEventArgs.cs
@@ -7,8 +7,8 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
-using System.ComponentModel;
 using AvalonDock.Layout;
+using System.ComponentModel;
 
 namespace AvalonDock
 {
@@ -32,4 +32,4 @@ public DocumentClosingEventArgs(LayoutDocument document)
 		/// </summary>
 		public LayoutDocument Document { get; private set; }
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Extensions.cs b/source/Components/AvalonDock/Extensions.cs
index b45fe5b5..d2fcb0e8 100644
--- a/source/Components/AvalonDock/Extensions.cs
+++ b/source/Components/AvalonDock/Extensions.cs
@@ -15,117 +15,115 @@ This program is provided to you under the terms of the Microsoft Public
 
 namespace AvalonDock
 {
-    internal static class Extensions
-    {
-        public static bool Contains(this IEnumerable collection, object item)
-        {
-            foreach (var o in collection)
-                if (o == item) return true;
-            return false;
-        }
+	internal static class Extensions
+	{
+		public static bool Contains(this IEnumerable collection, object item)
+		{
+			foreach (var o in collection)
+				if (o == item) return true;
+			return false;
+		}
 
+		public static void ForEach<T>(this IEnumerable<T> collection, Action<T> action)
+		{
+			foreach (var v in collection) action(v);
+		}
 
-        public static void ForEach<T>(this IEnumerable<T> collection, Action<T> action)
-        {
-            foreach (var v in collection) action(v);
-        }
+		public static int IndexOf<T>(this T[] array, T value) where T : class
+		{
+			for (var i = 0; i < array.Length; i++)
+				if (array[i] == value) return i;
+			return -1;
+		}
 
+		public static V GetValueOrDefault<V>(this WeakReference wr)
+		{
+			return wr == null || !wr.IsAlive ? default : (V)wr.Target;
+		}
 
-        public static int IndexOf<T>(this T[] array, T value) where T : class
-        {
-            for (var i = 0; i < array.Length; i++)
-                if (array[i] == value) return i;
-            return -1;
-        }
+		/// <summary>
+		/// Recursively get the visual tree children of a dependency object.
+		/// </summary>
+		/// <remarks>This function is recursive and will return all children.</remarks>
+		/// <param name="dependencyObject">The object to find the children of</param>
+		/// <returns>An enumerable with all the children of the dependency object</returns>
+		public static IEnumerable<DependencyObject> GetChildrenRecursive(this DependencyObject dependencyObject)
+		{
+			var children = dependencyObject.GetChildren();
+			foreach (var child in children)
+			{
+				yield return child;
+				foreach (var c in GetChildrenRecursive(child))
+				{
+					yield return c;
+				}
+			}
+		}
 
-        public static V GetValueOrDefault<V>(this WeakReference wr)
-        {
-            return wr == null || !wr.IsAlive ? default : (V)wr.Target;
-        }
+		/// <summary>
+		/// Get the visual tree children of a dependency object.
+		/// </summary>
+		/// <remarks>This function is not recursive and will only return the first level of children.</remarks>
+		/// <param name="dependencyObject">The object to find the children of</param>
+		/// <returns>An enumerable with all the first level children of the dependency object</returns>
+		public static IEnumerable<DependencyObject> GetChildren(this DependencyObject dependencyObject)
+		{
+			int n = VisualTreeHelper.GetChildrenCount(dependencyObject);
+			for (int i = 0; i < n; i++)
+			{
+				yield return VisualTreeHelper.GetChild(dependencyObject, i);
+			}
+		}
 
-        /// <summary>
-        /// Recursively get the visual tree children of a dependency object.
-        /// </summary>
-        /// <remarks>This function is recursive and will return all children.</remarks>
-        /// <param name="dependencyObject">The object to find the children of</param>
-        /// <returns>An enumerable with all the children of the dependency object</returns>
-        public static IEnumerable<DependencyObject> GetChildrenRecursive(this DependencyObject dependencyObject)
-        {
-            var children = dependencyObject.GetChildren();
-            foreach (var child in children)
-            {
-                yield return child;
-                foreach (var c in GetChildrenRecursive(child))
-                {
-                    yield return c;
-                }
-            }
-        }
+		/// <summary>
+		/// Get the visual tree parents of a dependency object,
+		/// </summary>
+		/// <param name="dependencyObject">The object to find the parents of</param>
+		/// <returns>An enumerable with the parents of the  <code>dependencyObject</code>, the first parent returned will be
+		/// the direct parent of <code>dependencyObject</code></returns>
+		public static IEnumerable<DependencyObject> GetParents(this DependencyObject dependencyObject)
+		{
+			while (dependencyObject != null)
+			{
+				dependencyObject = VisualTreeHelper.GetParent(dependencyObject);
+				if (dependencyObject != null)
+					yield return dependencyObject;
+			}
+		}
 
-        /// <summary>
-        /// Get the visual tree children of a dependency object.
-        /// </summary>
-        /// <remarks>This function is not recursive and will only return the first level of children.</remarks>
-        /// <param name="dependencyObject">The object to find the children of</param>
-        /// <returns>An enumerable with all the first level children of the dependency object</returns>
-        public static IEnumerable<DependencyObject> GetChildren(this DependencyObject dependencyObject)
-        {
-            int n = VisualTreeHelper.GetChildrenCount(dependencyObject);
-            for (int i = 0; i < n; i++)
-            {
-                yield return VisualTreeHelper.GetChild(dependencyObject, i);
-            }
-        }
+		/// <summary>
+		/// Calculate the sum multiple thicknesses in an enumerable
+		/// </summary>
+		/// <typeparam name="T">The type in the enumerable</typeparam>
+		/// <param name="enumerable">The enumerable with thicknesses</param>
+		/// <param name="func">A function returning the thickness from <code>T</code></param>
+		/// <returns>The total thickness</returns>
+		public static Thickness Sum<T>(this IEnumerable<T> enumerable, Func<T, Thickness> func)
+		{
+			double top = 0, bottom = 0, left = 0, right = 0;
+			foreach (var e in enumerable)
+			{
+				var t = func(e);
+				left = t.Left;
+				top += t.Top;
+				right = t.Right;
+				bottom += t.Bottom;
+			}
+			return new Thickness(left, top, right, bottom);
+		}
 
-        /// <summary>
-        /// Get the visual tree parents of a dependency object, 
-        /// </summary>
-        /// <param name="dependencyObject">The object to find the parents of</param>
-        /// <returns>An enumerable with the parents of the  <code>dependencyObject</code>, the first parent returned will be
-        /// the direct parent of <code>dependencyObject</code></returns>
-        public static IEnumerable<DependencyObject> GetParents(this DependencyObject dependencyObject)
-        {
-            while (dependencyObject != null)
-            {
-                dependencyObject = VisualTreeHelper.GetParent(dependencyObject);
-                if (dependencyObject != null)
-                    yield return dependencyObject;
-            }
-        }
-
-        /// <summary>
-        /// Calculate the sum multiple thicknesses in an enumerable
-        /// </summary>
-        /// <typeparam name="T">The type in the enumerable</typeparam>
-        /// <param name="enumerable">The enumerable with thicknesses</param>
-        /// <param name="func">A function returning the thickness from <code>T</code></param>
-        /// <returns>The total thickness</returns>
-        public static Thickness Sum<T>(this IEnumerable<T> enumerable, Func<T, Thickness> func)
-        {
-            double top = 0, bottom = 0, left = 0, right = 0;
-            foreach (var e in enumerable)
-            {
-                var t = func(e);
-                left = t.Left;
-                top += t.Top;
-                right = t.Right;
-                bottom += t.Bottom;
-            }
-            return new Thickness(left, top, right, bottom);
-        }
-
-        /// <summary>
-        /// Add two thicknesses, each individual component will be added independently of the others.
-        /// </summary>
-        /// <param name="thickness">The first thickness</param>
-        /// <param name="other">The second thickness</param>
-        /// <returns>The total thickness</returns>
-        public static Thickness Add(this Thickness thickness, Thickness other)
-        {
-            return new Thickness(thickness.Left + other.Left,
-                thickness.Top + other.Top,
-                thickness.Right + other.Right,
-                thickness.Bottom + other.Bottom);
-        }
-    }
-}
+		/// <summary>
+		/// Add two thicknesses, each individual component will be added independently of the others.
+		/// </summary>
+		/// <param name="thickness">The first thickness</param>
+		/// <param name="other">The second thickness</param>
+		/// <returns>The total thickness</returns>
+		public static Thickness Add(this Thickness thickness, Thickness other)
+		{
+			return new Thickness(thickness.Left + other.Left,
+				thickness.Top + other.Top,
+				thickness.Right + other.Right,
+				thickness.Bottom + other.Bottom);
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/AnchorSide.cs b/source/Components/AvalonDock/Layout/AnchorSide.cs
index 2f7c0f0b..63826763 100644
--- a/source/Components/AvalonDock/Layout/AnchorSide.cs
+++ b/source/Components/AvalonDock/Layout/AnchorSide.cs
@@ -27,4 +27,4 @@ public enum AnchorSide
 		/// <summary>The object is anchored to the bottom side.</summary>
 		Bottom
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/AnchorableShowStrategy.cs b/source/Components/AvalonDock/Layout/AnchorableShowStrategy.cs
index ec86796f..6412a4ec 100644
--- a/source/Components/AvalonDock/Layout/AnchorableShowStrategy.cs
+++ b/source/Components/AvalonDock/Layout/AnchorableShowStrategy.cs
@@ -37,4 +37,4 @@ public enum AnchorableShowStrategy : byte
 		/// </summary>
 		Bottom = 0x0020,
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs b/source/Components/AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs
index 5f47855a..8acb8b64 100644
--- a/source/Components/AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs
+++ b/source/Components/AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs
@@ -39,4 +39,4 @@ public ChildrenTreeChangedEventArgs(ChildrenTreeChange change)
 		/// <summary>Gets the type of <see cref="ChildrenTreeChange"/> for this event.</summary>
 		public ChildrenTreeChange Change { get; private set; }
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/Extensions.cs b/source/Components/AvalonDock/Layout/Extensions.cs
index 71153ad8..b3075e6e 100644
--- a/source/Components/AvalonDock/Layout/Extensions.cs
+++ b/source/Components/AvalonDock/Layout/Extensions.cs
@@ -85,7 +85,7 @@ public static AnchorSide GetSide(this ILayoutElement element)
 		/// <summary>
 		/// Removed with Issue 20 since Win32 definition seems to be buggy here
 		/// (GetMonitorInfo always returns false on rectangle returned from <see cref="Win32Helper.MonitorFromRect"/>)
-		/// 
+		///
 		/// <see cref="ILayoutElementForFloatingWindowExtension"/> for replacement candidate.
 		/// </summary>
 		/// <param name="paneInsideFloatingWindow"></param>
@@ -118,4 +118,4 @@ internal static void KeepInsideNearestMonitor_Issue20(this ILayoutElementForFloa
 
 		#endregion Internal Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/IAdjustableSizeLayout.cs b/source/Components/AvalonDock/Layout/IAdjustableSizeLayout.cs
index 3ea48a92..3bfc8468 100644
--- a/source/Components/AvalonDock/Layout/IAdjustableSizeLayout.cs
+++ b/source/Components/AvalonDock/Layout/IAdjustableSizeLayout.cs
@@ -15,4 +15,4 @@ public interface IAdjustableSizeLayout
 	{
 		void AdjustFixedChildrenPanelSizes(Size? parentSize = null);
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutAnchorablePane.cs b/source/Components/AvalonDock/Layout/ILayoutAnchorablePane.cs
index e2496ffa..40c1d9b3 100644
--- a/source/Components/AvalonDock/Layout/ILayoutAnchorablePane.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutAnchorablePane.cs
@@ -14,4 +14,4 @@ namespace AvalonDock.Layout
 	public interface ILayoutAnchorablePane : ILayoutPanelElement, ILayoutPane
 	{
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutContainer.cs b/source/Components/AvalonDock/Layout/ILayoutContainer.cs
index c1535db7..ed1eb112 100644
--- a/source/Components/AvalonDock/Layout/ILayoutContainer.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutContainer.cs
@@ -40,4 +40,4 @@ int ChildrenCount
 
 		#endregion Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutContentSelector.cs b/source/Components/AvalonDock/Layout/ILayoutContentSelector.cs
index a86d3c1b..c117169e 100644
--- a/source/Components/AvalonDock/Layout/ILayoutContentSelector.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutContentSelector.cs
@@ -13,6 +13,7 @@ namespace AvalonDock.Layout
 	public interface ILayoutContentSelector
 	{
 		#region Properties
+
 		/// <summary>Gets or sets the index of the selected content in the pane.</summary>
 		int SelectedContentIndex { get; set; }
 
@@ -22,6 +23,7 @@ public interface ILayoutContentSelector
 		#endregion Properties
 
 		#region Methods
+
 		/// <summary>Gets the index or -1 of the specified child content.</summary>
 		/// <param name="content"></param>
 		/// <returns></returns>
@@ -29,4 +31,4 @@ public interface ILayoutContentSelector
 
 		#endregion Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutControl.cs b/source/Components/AvalonDock/Layout/ILayoutControl.cs
index 5e431b76..95db6a4f 100644
--- a/source/Components/AvalonDock/Layout/ILayoutControl.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutControl.cs
@@ -18,4 +18,4 @@ ILayoutElement Model
 			get;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutDocumentPane.cs b/source/Components/AvalonDock/Layout/ILayoutDocumentPane.cs
index 207dfba8..f8f1ac0c 100644
--- a/source/Components/AvalonDock/Layout/ILayoutDocumentPane.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutDocumentPane.cs
@@ -14,4 +14,4 @@ namespace AvalonDock.Layout
 	public interface ILayoutDocumentPane : ILayoutPanelElement, ILayoutPane
 	{
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutElement.cs b/source/Components/AvalonDock/Layout/ILayoutElement.cs
index 58289f7b..03e0f6c4 100644
--- a/source/Components/AvalonDock/Layout/ILayoutElement.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutElement.cs
@@ -23,4 +23,4 @@ public interface ILayoutElement : INotifyPropertyChanged, INotifyPropertyChangin
 		/// <summary>Gets the <see cref="LayoutRoot"/> for this layout element.</summary>
 		ILayoutRoot Root { get; }
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs b/source/Components/AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs
index a3bde675..1eaf567f 100644
--- a/source/Components/AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs
@@ -5,7 +5,7 @@
 
 	/// <summary>
 	/// SetWindowPlacement won't correct placement for WPF tool windows
-	/// 
+	///
 	/// https://stackoverflow.com/questions/19203031/setwindowplacement-wont-correct-placement-for-wpf-tool-windows
 	/// </summary>
 	public static class ILayoutElementForFloatingWindowExtension
@@ -43,7 +43,7 @@ internal static void KeepInsideNearestMonitor(this ILayoutElementForFloatingWind
 				SystemParameters.PrimaryScreenHeight == SystemParameters.VirtualScreenHeight)
 			{
 				RECT primaryscreen = new RECT((int)SystemParameters.VirtualScreenLeft, (int)SystemParameters.VirtualScreenTop,
-				                              (int)SystemParameters.PrimaryScreenWidth, (int)SystemParameters.PrimaryScreenHeight);
+											  (int)SystemParameters.PrimaryScreenWidth, (int)SystemParameters.PrimaryScreenHeight);
 
 				if (!RectanglesIntersect(normalPosition, primaryscreen))
 				{
@@ -62,7 +62,7 @@ internal static void KeepInsideNearestMonitor(this ILayoutElementForFloatingWind
 			else
 			{
 				RECT primaryscreen = new RECT((int)SystemParameters.VirtualScreenLeft, (int)SystemParameters.VirtualScreenTop,
-				                              (int)SystemParameters.VirtualScreenWidth, (int)SystemParameters.VirtualScreenHeight);
+											  (int)SystemParameters.VirtualScreenWidth, (int)SystemParameters.VirtualScreenHeight);
 
 				if (!RectanglesIntersect(normalPosition, primaryscreen))
 				{
@@ -167,4 +167,4 @@ private static RECT PlaceOnScreen(RECT monitorRect, RECT windowRect)
 			return windowRect;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutElementWithVisibility.cs b/source/Components/AvalonDock/Layout/ILayoutElementWithVisibility.cs
index 2b40e646..e8816427 100644
--- a/source/Components/AvalonDock/Layout/ILayoutElementWithVisibility.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutElementWithVisibility.cs
@@ -15,4 +15,4 @@ public interface ILayoutElementWithVisibility
 		/// <summary>Invoke this to update the visibility (IsVisible) property of this layout element.</summary>
 		void ComputeVisibility();
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutGroup.cs b/source/Components/AvalonDock/Layout/ILayoutGroup.cs
index e02b0f8b..435e1cd2 100644
--- a/source/Components/AvalonDock/Layout/ILayoutGroup.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutGroup.cs
@@ -36,4 +36,4 @@ public interface ILayoutGroup : ILayoutContainer
 		/// <param name="element">The new element to be replaced over an existing element.</param>
 		void ReplaceChildAt(int index, ILayoutElement element);
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutOrientableGroup.cs b/source/Components/AvalonDock/Layout/ILayoutOrientableGroup.cs
index 24abda32..43d684ee 100644
--- a/source/Components/AvalonDock/Layout/ILayoutOrientableGroup.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutOrientableGroup.cs
@@ -17,4 +17,4 @@ public interface ILayoutOrientableGroup : ILayoutGroup
 		/// <summary>Gets/sets the <see cref="System.Windows.Controls.Orientation"/> of the <see cref="ILayoutGroup"/>.</summary>
 		Orientation Orientation { get; set; }
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutPane.cs b/source/Components/AvalonDock/Layout/ILayoutPane.cs
index 8a8446e1..4ff6daa5 100644
--- a/source/Components/AvalonDock/Layout/ILayoutPane.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutPane.cs
@@ -24,4 +24,4 @@ public interface ILayoutPane : ILayoutContainer, ILayoutElementWithVisibility
 		/// <param name="childIndex"></param>
 		void RemoveChildAt(int childIndex);
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutPaneSerializable.cs b/source/Components/AvalonDock/Layout/ILayoutPaneSerializable.cs
index 50c4d8af..e8fcc66c 100644
--- a/source/Components/AvalonDock/Layout/ILayoutPaneSerializable.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutPaneSerializable.cs
@@ -10,9 +10,9 @@ This program is provided to you under the terms of the Microsoft Public
 namespace AvalonDock.Layout
 {
 	/// <summary>Interface definition for a layout pane that can be identified by a unique id.</summary>
-	interface ILayoutPaneSerializable
+	internal interface ILayoutPaneSerializable
 	{
 		/// <summary>Gets/sets the unique id for this layout pane.</summary>
 		string Id { get; set; }
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutPanelElement.cs b/source/Components/AvalonDock/Layout/ILayoutPanelElement.cs
index 16930791..82cff966 100644
--- a/source/Components/AvalonDock/Layout/ILayoutPanelElement.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutPanelElement.cs
@@ -15,4 +15,4 @@ public interface ILayoutPanelElement : ILayoutElement
 		/// <summary>Gets whether the <see cref="ILayoutElement"/> is currently visible or not.</summary>
 		bool IsVisible { get; }
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutPositionableElement.cs b/source/Components/AvalonDock/Layout/ILayoutPositionableElement.cs
index 786e544e..29f8ddc6 100644
--- a/source/Components/AvalonDock/Layout/ILayoutPositionableElement.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutPositionableElement.cs
@@ -51,7 +51,6 @@ internal interface ILayoutPositionableElement : ILayoutElement, ILayoutElementFo
 		double CalculatedDockMinHeight();
 	}
 
-
 	/// <summary>Defines a layout element that supports actual width and height properties.</summary>
 	internal interface ILayoutPositionableElementWithActualSize : ILayoutPositionableElement
 	{
@@ -83,4 +82,4 @@ internal interface ILayoutElementForFloatingWindow
 		/// <summary>Gets/sets whether the floating window is maximized or not.</summary>
 		bool IsMaximized { get; set; }
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutPreviousContainer.cs b/source/Components/AvalonDock/Layout/ILayoutPreviousContainer.cs
index 43e33885..afab0935 100644
--- a/source/Components/AvalonDock/Layout/ILayoutPreviousContainer.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutPreviousContainer.cs
@@ -9,10 +9,10 @@ This program is provided to you under the terms of the Microsoft Public
 
 namespace AvalonDock.Layout
 {
-	interface ILayoutPreviousContainer
+	internal interface ILayoutPreviousContainer
 	{
 		ILayoutContainer PreviousContainer { get; set; }
 
 		string PreviousContainerId { get; set; }
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutRoot.cs b/source/Components/AvalonDock/Layout/ILayoutRoot.cs
index 2e1a934e..975bc61e 100644
--- a/source/Components/AvalonDock/Layout/ILayoutRoot.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutRoot.cs
@@ -52,4 +52,4 @@ public interface ILayoutRoot
 		/// remove empty unused elements, such as, <see cref="LayoutAnchorablePanes"/> without child elements.</summary>
 		void CollectGarbage();
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/ILayoutUpdateStrategy.cs b/source/Components/AvalonDock/Layout/ILayoutUpdateStrategy.cs
index 881f5d0f..67484ae8 100644
--- a/source/Components/AvalonDock/Layout/ILayoutUpdateStrategy.cs
+++ b/source/Components/AvalonDock/Layout/ILayoutUpdateStrategy.cs
@@ -47,4 +47,4 @@ bool BeforeInsertDocument(LayoutRoot layout,
 		void AfterInsertDocument(LayoutRoot layout,
 								 LayoutDocument anchorableShown);
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutAnchorGroup.cs b/source/Components/AvalonDock/Layout/LayoutAnchorGroup.cs
index 94579495..5531efdf 100644
--- a/source/Components/AvalonDock/Layout/LayoutAnchorGroup.cs
+++ b/source/Components/AvalonDock/Layout/LayoutAnchorGroup.cs
@@ -40,7 +40,7 @@ public override void ReadXml(System.Xml.XmlReader reader)
 			base.ReadXml(reader);
 		}
 
-		#endregion
+		#endregion Overrides
 
 		#region ILayoutPreviousContainer Interface
 
@@ -48,6 +48,7 @@ public override void ReadXml(System.Xml.XmlReader reader)
 
 		[field: NonSerialized]
 		private ILayoutContainer _previousContainer = null;
+
 		[XmlIgnore]
 		ILayoutContainer ILayoutPreviousContainer.PreviousContainer
 		{
@@ -62,18 +63,19 @@ ILayoutContainer ILayoutPreviousContainer.PreviousContainer
 			}
 		}
 
-		#endregion
+		#endregion PreviousContainer
 
 		string ILayoutPreviousContainer.PreviousContainerId { get; set; }
 
-		#endregion
+		#endregion ILayoutPreviousContainer Interface
 
 		#region ILayoutPaneSerializable Interface
 
-		string _id;
+		private string _id;
+
 		/// <inheritdoc />
 		string ILayoutPaneSerializable.Id { get => _id; set => _id = value; }
 
-		#endregion
+		#endregion ILayoutPaneSerializable Interface
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutAnchorSide.cs b/source/Components/AvalonDock/Layout/LayoutAnchorSide.cs
index b764361c..700df4b1 100644
--- a/source/Components/AvalonDock/Layout/LayoutAnchorSide.cs
+++ b/source/Components/AvalonDock/Layout/LayoutAnchorSide.cs
@@ -21,10 +21,13 @@ namespace AvalonDock.Layout
 	public class LayoutAnchorSide : LayoutGroup<LayoutAnchorGroup>
 	{
 		#region fields
+
 		private AnchorSide _side;
+
 		#endregion fields
 
 		#region Properties
+
 		/// <summary>Gets the side (top, bottom, left, right) that this layout is anchored in the layout.</summary>
 		public AnchorSide Side
 		{
@@ -37,7 +40,8 @@ private set
 				RaisePropertyChanged(nameof(Side));
 			}
 		}
-		#endregion
+
+		#endregion Properties
 
 		#region Overrides
 
@@ -51,7 +55,7 @@ protected override void OnParentChanged(ILayoutContainer oldValue, ILayoutContai
 			UpdateSide();
 		}
 
-		#endregion
+		#endregion Overrides
 
 		#region Private Methods
 
@@ -63,6 +67,6 @@ private void UpdateSide()
 			else if (this == Root.BottomSide) Side = AnchorSide.Bottom;
 		}
 
-		#endregion
+		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutAnchorable.cs b/source/Components/AvalonDock/Layout/LayoutAnchorable.cs
index d9cb1dff..60eef8ad 100644
--- a/source/Components/AvalonDock/Layout/LayoutAnchorable.cs
+++ b/source/Components/AvalonDock/Layout/LayoutAnchorable.cs
@@ -8,12 +8,12 @@ This program is provided to you under the terms of the Microsoft Public
  ************************************************************************/
 
 using System;
+using System.ComponentModel;
+using System.Globalization;
 using System.Linq;
 using System.Windows;
-using System.Xml.Serialization;
 using System.Windows.Controls;
-using System.Globalization;
-using System.ComponentModel;
+using System.Xml.Serialization;
 
 namespace AvalonDock.Layout
 {
@@ -26,6 +26,7 @@ namespace AvalonDock.Layout
 	public class LayoutAnchorable : LayoutContent
 	{
 		#region fields
+
 		private double _autohideWidth = 0.0;
 		private double _autohideMinWidth = 100.0;
 		private double _autohideHeight = 0.0;
@@ -35,9 +36,11 @@ public class LayoutAnchorable : LayoutContent
 		private bool _canDockAsTabbedDocument = true;
 		private bool _canCloseValueBeforeInternalSet;
 		private bool _canMove = true;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>Class constructor</summary>
 		public LayoutAnchorable()
 		{
@@ -183,6 +186,7 @@ public bool IsVisible
 		#endregion Properties
 
 		#region Overrides
+
 		/// <inheritdoc />
 		protected override void OnParentChanged(ILayoutContainer oldValue, ILayoutContainer newValue)
 		{
@@ -207,7 +211,7 @@ protected override void InternalDock()
 			//look for an available pane
 			if (anchorablePane == null) anchorablePane = root.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
 			var added = false;
-			if (root.Manager.LayoutUpdateStrategy != null) 
+			if (root.Manager.LayoutUpdateStrategy != null)
 				added = root.Manager.LayoutUpdateStrategy.BeforeInsertAnchorable(root, this, anchorablePane);
 
 			if (!added)
@@ -420,6 +424,7 @@ public void AddToLayout(DockingManager manager, AnchorableShowStrategy strategy)
 		public void ToggleAutoHide()
 		{
 			#region Anchorable is already auto hidden
+
 			if (IsAutoHidden)
 			{
 				var parentGroup = Parent as LayoutAnchorGroup;
@@ -448,6 +453,7 @@ public void ToggleAutoHide()
 								panel.Children.Add(previousContainer);
 							}
 							break;
+
 						case AnchorSide.Left:
 							if (parentGroup.Root.RootPanel.Orientation == Orientation.Horizontal)
 							{
@@ -465,10 +471,11 @@ public void ToggleAutoHide()
 								panel.Children.Add(oldRootPanel);
 							}
 							break;
+
 						case AnchorSide.Top:
 							if (parentGroup.Root.RootPanel.Orientation == Orientation.Vertical)
 							{
-								previousContainer = new LayoutAnchorablePane {DockMinHeight = AutoHideMinHeight};
+								previousContainer = new LayoutAnchorablePane { DockMinHeight = AutoHideMinHeight };
 								parentGroup.Root.RootPanel.Children.Insert(0, previousContainer);
 							}
 							else
@@ -482,14 +489,15 @@ public void ToggleAutoHide()
 								panel.Children.Add(oldRootPanel);
 							}
 							break;
+
 						case AnchorSide.Bottom:
 							if (parentGroup.Root.RootPanel.Orientation == Orientation.Vertical)
 							{
-                                previousContainer = new LayoutAnchorablePane
-                                {
-                                    DockMinHeight = AutoHideMinHeight
-                                };
-                                parentGroup.Root.RootPanel.Children.Add(previousContainer);
+								previousContainer = new LayoutAnchorablePane
+								{
+									DockMinHeight = AutoHideMinHeight
+								};
+								parentGroup.Root.RootPanel.Children.Add(previousContainer);
 							}
 							else
 							{
@@ -509,11 +517,11 @@ public void ToggleAutoHide()
 					//I'm about to remove parentGroup, redirect any content (ie hidden contents) that point to it
 					//to previousContainer
 					var root = parentGroup.Root as LayoutRoot;
-					foreach (var cnt in root.Descendents().OfType<ILayoutPreviousContainer>().Where(c => c.PreviousContainer == parentGroup)) 
+					foreach (var cnt in root.Descendents().OfType<ILayoutPreviousContainer>().Where(c => c.PreviousContainer == parentGroup))
 						cnt.PreviousContainer = previousContainer;
 				}
 
-				foreach (var anchorableToToggle in parentGroup.Children.ToArray()) 
+				foreach (var anchorableToToggle in parentGroup.Children.ToArray())
 					previousContainer.Children.Add(anchorableToToggle);
 
 				parentSide.Children.Remove(parentGroup);
@@ -521,14 +529,16 @@ public void ToggleAutoHide()
 				var parent = previousContainer.Parent as LayoutGroupBase;
 				while (parent != null)
 				{
-					if (parent is LayoutGroup<ILayoutPanelElement> layoutGroup) 
+					if (parent is LayoutGroup<ILayoutPanelElement> layoutGroup)
 						layoutGroup.ComputeVisibility();
 					parent = parent.Parent as LayoutGroupBase;
 				}
 			}
+
 			#endregion Anchorable is already auto hidden
 
 			#region Anchorable is docked
+
 			else if (Parent is LayoutAnchorablePane)
 			{
 				var root = Root;
@@ -550,6 +560,7 @@ public void ToggleAutoHide()
 					case AnchorSide.Bottom: root.BottomSide?.Children.Add(newAnchorGroup); break;
 				}
 			}
+
 			#endregion Anchorable is docked
 		}
 
@@ -597,4 +608,4 @@ private void UpdateParentVisibility()
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs b/source/Components/AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs
index 7d14f251..7db59a02 100644
--- a/source/Components/AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs
+++ b/source/Components/AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs
@@ -23,10 +23,12 @@ namespace AvalonDock.Layout
 	public class LayoutAnchorableFloatingWindow : LayoutFloatingWindow, ILayoutElementWithVisibility
 	{
 		#region fields
+
 		private LayoutAnchorablePaneGroup _rootPanel;
 
 		[NonSerialized]
 		private bool _isVisible = true;
+
 		#endregion fields
 
 		#region Events
@@ -34,7 +36,7 @@ public class LayoutAnchorableFloatingWindow : LayoutFloatingWindow, ILayoutEleme
 		/// <summary>Event is invoked when the visibility of this object has changed.</summary>
 		public event EventHandler IsVisibleChanged;
 
-		#endregion
+		#endregion Events
 
 		#region Properties
 
@@ -191,4 +193,4 @@ private void _rootPanel_ChildrenTreeChanged(object sender, ChildrenTreeChangedEv
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutAnchorablePane.cs b/source/Components/AvalonDock/Layout/LayoutAnchorablePane.cs
index 207d009d..b8d6d3e6 100644
--- a/source/Components/AvalonDock/Layout/LayoutAnchorablePane.cs
+++ b/source/Components/AvalonDock/Layout/LayoutAnchorablePane.cs
@@ -22,15 +22,19 @@ namespace AvalonDock.Layout
 	public class LayoutAnchorablePane : LayoutPositionableGroup<LayoutAnchorable>, ILayoutAnchorablePane, ILayoutPositionableElement, ILayoutContentSelector, ILayoutPaneSerializable
 	{
 		#region fields
+
 		private int _selectedIndex = -1;
 
 		[XmlIgnore]
 		private bool _autoFixSelectedContent = true;
+
 		private string _name = null;
-		string _id;
+		private string _id;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>Class constructor</summary>
 		public LayoutAnchorablePane()
 		{
@@ -205,6 +209,7 @@ public bool IsDirectlyHostedInFloatingWindow
 		#endregion Public Methods
 
 		#region Internal Methods
+
 		/// <summary>Invalidates the current <see cref="SelectedContentIndex"/> and sets the index for the next avialable child with IsEnabled == true.</summary>
 		internal void SetNextSelectedIndex()
 		{
@@ -237,4 +242,4 @@ private void AutoFixSelectedContent()
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutAnchorablePaneGroup.cs b/source/Components/AvalonDock/Layout/LayoutAnchorablePaneGroup.cs
index 3f9d8716..67f67425 100644
--- a/source/Components/AvalonDock/Layout/LayoutAnchorablePaneGroup.cs
+++ b/source/Components/AvalonDock/Layout/LayoutAnchorablePaneGroup.cs
@@ -17,17 +17,20 @@ namespace AvalonDock.Layout
 	/// <summary>
 	/// Implements an element in the layout model tree that can contain and arrange multiple
 	/// <see cref="LayoutAnchorablePane"/> elements in x or y directions, which in turn contain
-	/// <see cref="LayoutAnchorable"/> elements. 
+	/// <see cref="LayoutAnchorable"/> elements.
 	/// </summary>
 	[ContentProperty(nameof(Children))]
 	[Serializable]
 	public class LayoutAnchorablePaneGroup : LayoutPositionableGroup<ILayoutAnchorablePane>, ILayoutAnchorablePane, ILayoutOrientableGroup
 	{
 		#region fields
+
 		private Orientation _orientation;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>Class constructor</summary>
 		public LayoutAnchorablePaneGroup()
 		{
@@ -39,9 +42,10 @@ public LayoutAnchorablePaneGroup(LayoutAnchorablePane firstChild)
 			Children.Add(firstChild);
 		}
 
-		#endregion
+		#endregion Constructors
 
 		#region Properties
+
 		/// <summary>
 		/// Gets/sets the <see cref="System.Windows.Controls.Orientation"/> of this object.
 		/// </summary>
@@ -56,6 +60,7 @@ public Orientation Orientation
 				RaisePropertyChanged(nameof(Orientation));
 			}
 		}
+
 		#endregion Properties
 
 		#region Overrides
@@ -123,7 +128,7 @@ public override void ConsoleDump(int tab)
 		}
 #endif
 
-		#endregion
+		#endregion Overrides
 
 		#region Private Methods
 
@@ -132,6 +137,6 @@ private void UpdateParentVisibility()
 			if (Parent is ILayoutElementWithVisibility parentPane) parentPane.ComputeVisibility();
 		}
 
-		#endregion
+		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutContent.cs b/source/Components/AvalonDock/Layout/LayoutContent.cs
index 3eb08602..92c2dbd2 100644
--- a/source/Components/AvalonDock/Layout/LayoutContent.cs
+++ b/source/Components/AvalonDock/Layout/LayoutContent.cs
@@ -7,15 +7,15 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
+using AvalonDock.Controls;
 using System;
+using System.ComponentModel;
+using System.Globalization;
 using System.Linq;
-using System.Windows.Markup;
-using System.Xml.Serialization;
 using System.Windows;
-using System.Globalization;
+using System.Windows.Markup;
 using System.Windows.Media;
-using System.ComponentModel;
-using AvalonDock.Controls;
+using System.Xml.Serialization;
 
 namespace AvalonDock.Layout
 {
@@ -28,6 +28,7 @@ namespace AvalonDock.Layout
 	public abstract class LayoutContent : LayoutElement, IXmlSerializable, ILayoutElementForFloatingWindow, IComparable<LayoutContent>, ILayoutPreviousContainer
 	{
 		#region Constructors
+
 		/// <summary>
 		/// Class constructor
 		/// </summary>
@@ -45,7 +46,7 @@ internal LayoutContent()
 		/// <summary>
 		/// Event fired when the content is about to be closed (i.e. removed definitely from the layout)
 		/// </summary>
-		/// <remarks>Please note that <see cref="LayoutAnchorable"/> also can be hidden. Usually user hide anchorables when click the 'X' button. To completely close 
+		/// <remarks>Please note that <see cref="LayoutAnchorable"/> also can be hidden. Usually user hide anchorables when click the 'X' button. To completely close
 		/// an anchorable the user should click the 'Close' menu item from the context menu. When an <see cref="LayoutAnchorable"/> is hidden its visibility changes to false and
 		/// <see cref="LayoutAnchorable.IsHidden"/> property is set to true.
 		/// Handle the Hiding event for the <see cref="LayoutAnchorable"/> to cancel the hide operation.</remarks>
@@ -82,6 +83,7 @@ private static object CoerceTitleValue(DependencyObject obj, object value)
 		#endregion Title
 
 		#region Content
+
 		[NonSerialized]
 		private object _content = null;
 
@@ -98,6 +100,7 @@ public object Content
 				if (ContentId == null) SetContentIdFromContent();
 			}
 		}
+
 		#endregion Content
 
 		#region ContentId
@@ -119,7 +122,7 @@ public string ContentId
 
 		private static void OnContentIdPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
 		{
-			if (obj is LayoutContent layoutContent) layoutContent.OnContentIdPropertyChanged((string) args.OldValue, (string) args.NewValue);
+			if (obj is LayoutContent layoutContent) layoutContent.OnContentIdPropertyChanged((string)args.OldValue, (string)args.NewValue);
 		}
 
 		private void OnContentIdPropertyChanged(string oldValue, string newValue)
@@ -207,6 +210,7 @@ protected virtual void OnIsActiveChanged(bool oldValue, bool newValue)
 		#region IsLastFocusedDocument
 
 		private bool _isLastFocusedDocument = false;
+
 		public bool IsLastFocusedDocument
 		{
 			get => _isLastFocusedDocument;
@@ -258,6 +262,7 @@ protected string PreviousContainerId
 		#endregion PreviousContainer
 
 		#region PreviousContainerIndex
+
 		[field: NonSerialized]
 		private int _previousContainerIndex = -1;
 
@@ -295,6 +300,7 @@ public DateTime? LastActivationTimeStamp
 		#region FloatingWidth
 
 		private double _floatingWidth = 0.0;
+
 		public double FloatingWidth
 		{
 			get => _floatingWidth;
@@ -330,6 +336,7 @@ public double FloatingHeight
 		#region FloatingLeft
 
 		private double _floatingLeft = 0.0;
+
 		public double FloatingLeft
 		{
 			get => _floatingLeft;
@@ -347,6 +354,7 @@ public double FloatingLeft
 		#region FloatingTop
 
 		private double _floatingTop = 0.0;
+
 		public double FloatingTop
 		{
 			get => _floatingTop;
@@ -401,6 +409,7 @@ public object ToolTip
 		#region IconSource
 
 		private ImageSource _iconSource = null;
+
 		public ImageSource IconSource
 		{
 			get => _iconSource;
@@ -417,6 +426,7 @@ public ImageSource IconSource
 		#region CanClose
 
 		internal bool _canClose = true;
+
 		public bool CanClose
 		{
 			get => _canClose;
@@ -433,6 +443,7 @@ public bool CanClose
 		#region CanFloat
 
 		private bool _canFloat = true;
+
 		public bool CanFloat
 		{
 			get => _canFloat;
@@ -449,6 +460,7 @@ public bool CanFloat
 		#region IsEnabled
 
 		private bool _isEnabled = true;
+
 		public bool IsEnabled
 		{
 			get => _isEnabled;
@@ -463,6 +475,7 @@ public bool IsEnabled
 		#endregion IsEnabled
 
 		#region TabItem
+
 		public LayoutDocumentTabItem TabItem { get; internal set; }
 
 		#endregion TabItem
@@ -535,8 +548,8 @@ public virtual void WriteXml(System.Xml.XmlWriter writer)
 			if (!string.IsNullOrWhiteSpace(ContentId))
 				writer.WriteAttributeString(nameof(ContentId), ContentId);
 
-			if (ToolTip is string toolTip &&!string.IsNullOrWhiteSpace(toolTip))
-					writer.WriteAttributeString(nameof(ToolTip), toolTip);
+			if (ToolTip is string toolTip && !string.IsNullOrWhiteSpace(toolTip))
+				writer.WriteAttributeString(nameof(ToolTip), toolTip);
 
 			if (FloatingLeft != 0.0) writer.WriteAttributeString(nameof(FloatingLeft), FloatingLeft.ToString(CultureInfo.InvariantCulture));
 			if (FloatingTop != 0.0) writer.WriteAttributeString(nameof(FloatingTop), FloatingTop.ToString(CultureInfo.InvariantCulture));
@@ -744,4 +757,4 @@ protected virtual void InternalDock()
 
 		#endregion Internal Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutDocument.cs b/source/Components/AvalonDock/Layout/LayoutDocument.cs
index 3fe144b9..a959724e 100644
--- a/source/Components/AvalonDock/Layout/LayoutDocument.cs
+++ b/source/Components/AvalonDock/Layout/LayoutDocument.cs
@@ -19,9 +19,11 @@ namespace AvalonDock.Layout
 	public class LayoutDocument : LayoutContent
 	{
 		#region fields
+
 		private bool _canMove = true;
 		private bool _isVisible = true;
 		private string _description = null;
+
 		#endregion fields
 
 		#region Properties
@@ -72,7 +74,7 @@ internal bool CloseDocument()
 			return true;
 		}
 
-		#endregion
+		#endregion Internal Methods
 
 		#region Overrides
 
@@ -131,4 +133,4 @@ protected override void InternalDock()
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutDocumentFloatingWindow.cs b/source/Components/AvalonDock/Layout/LayoutDocumentFloatingWindow.cs
index 520df986..68d07d6a 100644
--- a/source/Components/AvalonDock/Layout/LayoutDocumentFloatingWindow.cs
+++ b/source/Components/AvalonDock/Layout/LayoutDocumentFloatingWindow.cs
@@ -9,11 +9,11 @@ This program is provided to you under the terms of the Microsoft Public
 
 using System;
 using System.Collections.Generic;
-using System.Windows.Markup;
 using System.Diagnostics;
 using System.Linq;
-using System.Xml.Serialization;
+using System.Windows.Markup;
 using System.Xml;
+using System.Xml.Serialization;
 
 namespace AvalonDock.Layout
 {
@@ -23,10 +23,12 @@ namespace AvalonDock.Layout
 	public class LayoutDocumentFloatingWindow : LayoutFloatingWindow, ILayoutElementWithVisibility
 	{
 		#region fields
+
 		private LayoutDocumentPaneGroup _rootPanel = null;
 
 		[NonSerialized]
 		private bool _isVisible = true;
+
 		#endregion fields
 
 		public event EventHandler IsVisibleChanged;
@@ -65,6 +67,7 @@ private void _rootPanel_ChildrenTreeChanged(object sender, ChildrenTreeChangedEv
 		#endregion RootPanel
 
 		#region IsSinglePane
+
 		public bool IsSinglePane => RootPanel?.Descendents().OfType<LayoutDocumentPane>().Count(p => p.IsVisible) == 1;
 
 		public LayoutDocumentPane SinglePane
@@ -77,6 +80,7 @@ public LayoutDocumentPane SinglePane
 				return singlePane;
 			}
 		}
+
 		#endregion IsSinglePane
 
 		[XmlIgnore]
@@ -106,14 +110,14 @@ public override IEnumerable<ILayoutElement> Children
 		/// <inheritdoc />
 		public override void RemoveChild(ILayoutElement element)
 		{
-			Debug.Assert( element == RootPanel && element != null );
+			Debug.Assert(element == RootPanel && element != null);
 			RootPanel = null;
 		}
 
 		/// <inheritdoc />
 		public override void ReplaceChild(ILayoutElement oldElement, ILayoutElement newElement)
 		{
-			Debug.Assert( oldElement == RootPanel && oldElement != null );
+			Debug.Assert(oldElement == RootPanel && oldElement != null);
 			RootPanel = newElement as LayoutDocumentPaneGroup;
 		}
 
@@ -174,4 +178,4 @@ public override void ConsoleDump(int tab)
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutDocumentPane.cs b/source/Components/AvalonDock/Layout/LayoutDocumentPane.cs
index 023bf548..f51452f9 100644
--- a/source/Components/AvalonDock/Layout/LayoutDocumentPane.cs
+++ b/source/Components/AvalonDock/Layout/LayoutDocumentPane.cs
@@ -24,15 +24,18 @@ namespace AvalonDock.Layout
 	public class LayoutDocumentPane : LayoutPositionableGroup<LayoutContent>, ILayoutDocumentPane, ILayoutPositionableElement, ILayoutContentSelector, ILayoutPaneSerializable
 	{
 		#region fields
+
 		private bool _showHeader = true;
 		private int _selectedIndex = -1;
-		string _id;
+		private string _id;
 
 		[XmlIgnore]
-        readonly bool _autoFixSelectedContent = true;
+		private readonly bool _autoFixSelectedContent = true;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>Standard class constructor</summary>
 		public LayoutDocumentPane()
 		{
@@ -51,6 +54,7 @@ public LayoutDocumentPane(LayoutContent firstChild)
 		#endregion Constructors
 
 		#region Properties
+
 		/// <summary>Gets/sets whether to show the header or not.</summary>
 		public bool ShowHeader
 		{
@@ -104,9 +108,11 @@ public IEnumerable<LayoutContent> ChildrenSorted
 				return listSorted;
 			}
 		}
+
 		#endregion Properties
 
 		#region Overrides
+
 		/// <inheritdoc />
 		protected override bool GetVisibility()
 		{
@@ -142,7 +148,7 @@ protected override void OnChildrenCollectionChanged()
 			//RaisePropertyChanged(nameof(CanHide));
 			RaisePropertyChanged(nameof(IsDirectlyHostedInFloatingWindow));
 			base.OnChildrenCollectionChanged();
-			RaisePropertyChanged( nameof(ChildrenSorted));
+			RaisePropertyChanged(nameof(ChildrenSorted));
 		}
 
 		private void AutoFixSelectedContent()
@@ -192,16 +198,18 @@ public override void ConsoleDump(int tab)
 				child.ConsoleDump(tab + 1);
 		}
 #endif
+
 		#endregion Overrides
 
 		#region methods
+
 		/// <summary>Gets the index of the <paramref name="content"/> in the Children collection or -1</summary>
 		/// <param name="content"></param>
 		/// <returns></returns>
 		public int IndexOf(LayoutContent content)
 		{
-            return !(content is LayoutDocument documentChild) ? -1 : Children.IndexOf(documentChild);
-        }
+			return !(content is LayoutDocument documentChild) ? -1 : Children.IndexOf(documentChild);
+		}
 
 		/// <summary>Invalidates the current <see cref="SelectedContentIndex"/> and sets the index for the next avialable child with IsEnabled == true.</summary>
 		internal void SetNextSelectedIndex()
@@ -217,7 +225,7 @@ internal void SetNextSelectedIndex()
 
 		/// <summary>Updates the <see cref="IsDirectlyHostedInFloatingWindow"/> property of this object.</summary>
 		internal void UpdateIsDirectlyHostedInFloatingWindow() => RaisePropertyChanged(nameof(IsDirectlyHostedInFloatingWindow));
-		
+
 		/// <inheritdoc/>
 		protected override void OnParentChanged(ILayoutContainer oldValue, ILayoutContainer newValue)
 		{
@@ -229,6 +237,7 @@ protected override void OnParentChanged(ILayoutContainer oldValue, ILayoutContai
 
 		/// <inheritdoc/>
 		private void OnParentChildrenCollectionChanged(object sender, EventArgs e) => RaisePropertyChanged(nameof(IsDirectlyHostedInFloatingWindow));
+
 		#endregion methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutDocumentPaneGroup.cs b/source/Components/AvalonDock/Layout/LayoutDocumentPaneGroup.cs
index d25e2313..ae317ec5 100644
--- a/source/Components/AvalonDock/Layout/LayoutDocumentPaneGroup.cs
+++ b/source/Components/AvalonDock/Layout/LayoutDocumentPaneGroup.cs
@@ -22,10 +22,13 @@ namespace AvalonDock.Layout
 	public class LayoutDocumentPaneGroup : LayoutPositionableGroup<ILayoutDocumentPane>, ILayoutDocumentPane, ILayoutOrientableGroup
 	{
 		#region fields
+
 		private Orientation _orientation;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>Class constructor</summary>
 		public LayoutDocumentPaneGroup()
 		{
@@ -40,6 +43,7 @@ public LayoutDocumentPaneGroup(LayoutDocumentPane documentPane)
 		#endregion Constructors
 
 		#region Properties
+
 		/// <summary>Gets/sets the (Horizontal, Vertical) <see cref="System.Windows.Controls.Orientation"/> of this group.</summary>
 		public Orientation Orientation
 		{
@@ -88,4 +92,4 @@ public override void ConsoleDump(int tab)
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutElement.cs b/source/Components/AvalonDock/Layout/LayoutElement.cs
index 6d424c0b..29da33f2 100644
--- a/source/Components/AvalonDock/Layout/LayoutElement.cs
+++ b/source/Components/AvalonDock/Layout/LayoutElement.cs
@@ -8,32 +8,35 @@ This program is provided to you under the terms of the Microsoft Public
  ************************************************************************/
 
 using System;
-using System.Windows;
 using System.ComponentModel;
+using System.Windows;
 using System.Xml.Serialization;
 
 namespace AvalonDock.Layout
 {
 	/// <summary>
 	/// Implements an abstract base class for almost all layout models in the AvalonDock.Layout namespace.
-	/// 
+	///
 	/// This base inherites from <see cref="DependencyObject"/> and implements <see cref="PropertyChanged"/>
 	/// and <see cref="PropertyChanging"/> events. Deriving classes can, therefore, implement
 	/// depedency object and/or viewmodel specific functionalities.
-	/// class supports both 
+	/// class supports both
 	/// </summary>
 	[Serializable]
 	public abstract class LayoutElement : DependencyObject, ILayoutElement
 	{
 		#region fields
+
 		[NonSerialized]
 		private ILayoutContainer _parent = null;
 
 		[NonSerialized]
 		private ILayoutRoot _root = null;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>
 		/// Class constructor
 		/// </summary>
@@ -44,6 +47,7 @@ internal LayoutElement()
 		#endregion Constructors
 
 		#region Events
+
 		/// <summary>Raised when a property has changed (after the change has taken place).</summary>
 		[field: NonSerialized]
 		[field: XmlIgnore]
@@ -57,6 +61,7 @@ internal LayoutElement()
 		#endregion Events
 
 		#region Properties
+
 		/// <summary>Gets or sets the parent container of the element</summary>
 		[XmlIgnore]
 		public ILayoutContainer Parent
@@ -89,6 +94,7 @@ public ILayoutRoot Root
 				return parent as ILayoutRoot;
 			}
 		}
+
 		#endregion Properties
 
 		#region Public Methods
@@ -118,8 +124,8 @@ protected virtual void OnParentChanged(ILayoutContainer oldValue, ILayoutContain
 		/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="Root"/> property.</summary>
 		protected virtual void OnRootChanged(ILayoutRoot oldRoot, ILayoutRoot newRoot)
 		{
-			((LayoutRoot) oldRoot)?.OnLayoutElementRemoved(this);
-			((LayoutRoot) newRoot)?.OnLayoutElementAdded(this);
+			((LayoutRoot)oldRoot)?.OnLayoutElementRemoved(this);
+			((LayoutRoot)newRoot)?.OnLayoutElementAdded(this);
 		}
 
 		/// <summary>Should be invoked to raise the <see cref="PropertyChanged"/> event for the property named in <paramref name="propertyName"/>.
@@ -134,4 +140,4 @@ protected virtual void OnRootChanged(ILayoutRoot oldRoot, ILayoutRoot newRoot)
 
 		#endregion protected methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutElementEventArgs.cs b/source/Components/AvalonDock/Layout/LayoutElementEventArgs.cs
index f1417d51..fa20a09e 100644
--- a/source/Components/AvalonDock/Layout/LayoutElementEventArgs.cs
+++ b/source/Components/AvalonDock/Layout/LayoutElementEventArgs.cs
@@ -28,4 +28,4 @@ public LayoutElementEventArgs(LayoutElement element)
 		/// <summary>Gets the particular <see cref="LayoutElement"/> for which this event has been raised.</summary>
 		public LayoutElement Element { get; private set; }
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutFloatingWindow.cs b/source/Components/AvalonDock/Layout/LayoutFloatingWindow.cs
index 0cf94413..0a479b47 100644
--- a/source/Components/AvalonDock/Layout/LayoutFloatingWindow.cs
+++ b/source/Components/AvalonDock/Layout/LayoutFloatingWindow.cs
@@ -9,9 +9,9 @@ This program is provided to you under the terms of the Microsoft Public
 
 using System;
 using System.Collections.Generic;
-using System.Xml.Serialization;
-using System.Xml.Schema;
 using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
 
 namespace AvalonDock.Layout
 {
@@ -22,6 +22,7 @@ namespace AvalonDock.Layout
 	public abstract class LayoutFloatingWindow : LayoutElement, ILayoutContainer, IXmlSerializable
 	{
 		#region Properties
+
 		/// <summary>Gets the list of <see cref="ILayoutElement"/> based children below this object.</summary>
 		public abstract IEnumerable<ILayoutElement> Children { get; }
 
@@ -33,6 +34,7 @@ public abstract class LayoutFloatingWindow : LayoutElement, ILayoutContainer, IX
 		#endregion Properties
 
 		#region Public Methods
+
 		/// <summary>Remove the child element from the collection of children.</summary>
 		/// <param name="element"></param>
 		public abstract void RemoveChild(ILayoutElement element);
@@ -43,6 +45,7 @@ public abstract class LayoutFloatingWindow : LayoutElement, ILayoutContainer, IX
 		public abstract void ReplaceChild(ILayoutElement oldElement, ILayoutElement newElement);
 
 		#region IXmlSerializable interface members
+
 		/// <inheritdoc cref="IXmlSerializable"/>
 		public XmlSchema GetSchema()
 		{
@@ -62,7 +65,9 @@ public virtual void WriteXml(XmlWriter writer)
 				serializer.Serialize(writer, child);
 			}
 		}
+
 		#endregion IXmlSerializable interface members
+
 		#endregion Public Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutGroup.cs b/source/Components/AvalonDock/Layout/LayoutGroup.cs
index 17f27b43..0d201247 100644
--- a/source/Components/AvalonDock/Layout/LayoutGroup.cs
+++ b/source/Components/AvalonDock/Layout/LayoutGroup.cs
@@ -9,10 +9,10 @@ This program is provided to you under the terms of the Microsoft Public
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Collections.ObjectModel;
-using System.Xml.Serialization;
 using System.Collections.Specialized;
+using System.Linq;
+using System.Xml.Serialization;
 
 namespace AvalonDock.Layout
 {
@@ -25,11 +25,14 @@ namespace AvalonDock.Layout
 	public abstract class LayoutGroup<T> : LayoutGroupBase, ILayoutGroup, IXmlSerializable where T : class, ILayoutElement
 	{
 		#region fields
+
 		private readonly ObservableCollection<T> _children = new ObservableCollection<T>();
 		private bool _isVisible = true;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>Class constructor.</summary>
 		internal LayoutGroup()
 		{
@@ -39,6 +42,7 @@ internal LayoutGroup()
 		#endregion Constructors
 
 		#region Properties
+
 		/// <summary>Gets a collection of children objects below this object.</summary>
 		public ObservableCollection<T> Children => _children;
 
@@ -65,6 +69,7 @@ protected set
 		#endregion Properties
 
 		#region Public Methods
+
 		/// <inheritdoc cref="ILayoutElementWithVisibility" />
 		public void ComputeVisibility() => IsVisible = GetVisibility();
 
@@ -263,4 +268,4 @@ private Type FindType(string name)
 
 		#endregion Private Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutGroupBase.cs b/source/Components/AvalonDock/Layout/LayoutGroupBase.cs
index d200547c..649b66a0 100644
--- a/source/Components/AvalonDock/Layout/LayoutGroupBase.cs
+++ b/source/Components/AvalonDock/Layout/LayoutGroupBase.cs
@@ -37,6 +37,7 @@ public abstract class LayoutGroupBase : LayoutElement
 		#endregion Events
 
 		#region Internal Methods
+
 		/// <summary>
 		/// Raises an event to make parents update their children up the tree.
 		/// Otherwise, they will not be redrawn.
@@ -74,4 +75,4 @@ protected void NotifyChildrenTreeChanged(ChildrenTreeChange change)
 
 		#endregion Internal Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutPanel.cs b/source/Components/AvalonDock/Layout/LayoutPanel.cs
index c0a739a3..e3c5b4a4 100644
--- a/source/Components/AvalonDock/Layout/LayoutPanel.cs
+++ b/source/Components/AvalonDock/Layout/LayoutPanel.cs
@@ -9,9 +9,9 @@ This program is provided to you under the terms of the Microsoft Public
 
 using System;
 using System.Linq;
-using System.Windows.Markup;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Markup;
 
 namespace AvalonDock.Layout
 {
@@ -21,10 +21,13 @@ namespace AvalonDock.Layout
 	public class LayoutPanel : LayoutPositionableGroup<ILayoutPanelElement>, ILayoutPanelElement, ILayoutOrientableGroup
 	{
 		#region fields
+
 		private Orientation _orientation;
+
 		#endregion fields
-		
+
 		#region Constructors
+
 		/// <summary>Class constructor</summary>
 		public LayoutPanel()
 		{
@@ -40,6 +43,7 @@ public LayoutPanel(ILayoutPanelElement firstChild)
 		#endregion Constructors
 
 		#region Properties
+
 		/// <summary>Gets/sets the orientation for this panel.</summary>
 		public Orientation Orientation
 		{
@@ -54,6 +58,7 @@ public Orientation Orientation
 		}
 
 		#region CanDock
+
 		/// <summary>
 		/// Using a DependencyProperty as the backing store for thhe <see cref="CanDock"/> property.
 		/// </summary>
@@ -65,7 +70,7 @@ public Orientation Orientation
 		/// Gets/sets dependency property that determines whether docking of dragged items
 		/// is enabled or not. This property can be used disable/enable docking of
 		/// dragged FloatingWindowControls.
-		/// 
+		///
 		/// This property should only be set to false if:
 		/// <see cref="LayoutAnchorable.CanMove"/> and <see cref="LayoutDocument.CanMove"/>
 		/// are false since users will otherwise be able to:
@@ -77,6 +82,7 @@ public bool CanDock
 			get { return (bool)GetValue(CanDockProperty); }
 			set { SetValue(CanDockProperty, value); }
 		}
+
 		#endregion CanDock
 
 		#endregion Properties
@@ -93,7 +99,7 @@ public override void WriteXml(System.Xml.XmlWriter writer)
 
 			if (CanDock == false)
 				writer.WriteAttributeString(nameof(CanDock), CanDock.ToString());
-			
+
 			base.WriteXml(writer);
 		}
 
@@ -129,4 +135,4 @@ public override void ConsoleDump(int tab)
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutPositionableGroup.cs b/source/Components/AvalonDock/Layout/LayoutPositionableGroup.cs
index ee141b6c..b18a58be 100644
--- a/source/Components/AvalonDock/Layout/LayoutPositionableGroup.cs
+++ b/source/Components/AvalonDock/Layout/LayoutPositionableGroup.cs
@@ -8,10 +8,9 @@ This program is provided to you under the terms of the Microsoft Public
  ************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Windows;
 using System.Globalization;
 using System.Linq;
+using System.Windows;
 using System.Windows.Controls;
 
 namespace AvalonDock.Layout
@@ -22,14 +21,17 @@ namespace AvalonDock.Layout
 	public abstract class LayoutPositionableGroup<T> : LayoutGroup<T>, ILayoutPositionableElementWithActualSize where T : class, ILayoutElement
 	{
 		#region fields
+
 		private static GridLengthConverter _gridLengthConverter = new GridLengthConverter();
 
 		// DockWidth fields
 		private GridLength _dockWidth = new GridLength(1.0, GridUnitType.Star);
+
 		private double? _resizableAbsoluteDockWidth;
 
 		// DockHeight fields
 		private GridLength _dockHeight = new GridLength(1.0, GridUnitType.Star);
+
 		private double? _resizableAbsoluteDockHeight;
 
 		private bool _allowDuplicateContent = true;
@@ -49,6 +51,7 @@ public abstract class LayoutPositionableGroup<T> : LayoutGroup<T>, ILayoutPositi
 
 		[NonSerialized]
 		private double _actualHeight;
+
 		#endregion fields
 
 		#region Events
@@ -63,6 +66,7 @@ public abstract class LayoutPositionableGroup<T> : LayoutGroup<T>, ILayoutPositi
 		#region Properties
 
 		#region DockWidth
+
 		public GridLength DockWidth
 		{
 			get => _dockWidth.IsAbsolute && _resizableAbsoluteDockWidth < _dockWidth.Value && _resizableAbsoluteDockWidth.HasValue ?
@@ -101,6 +105,7 @@ public double ResizableAbsoluteDockWidth
 		#endregion DockWidth
 
 		#region DockHeight
+
 		public GridLength DockHeight
 		{
 			get => _dockHeight.IsAbsolute && _resizableAbsoluteDockHeight < _dockHeight.Value && _resizableAbsoluteDockHeight.HasValue ?
@@ -184,7 +189,7 @@ public double CalculatedDockMinWidth()
 
 		/// <summary>
 		/// Defines the smallest available width that can be applied to a deriving element.
-		/// 
+		///
 		/// The system ensures the minimum width by blocking/limiting <see cref="GridSplitter"/>
 		/// movement when the user resizes a deriving element or resizes the main window.
 		/// </summary>
@@ -217,7 +222,7 @@ public double CalculatedDockMinHeight()
 
 		/// <summary>
 		/// Defines the smallest available height that can be applied to a deriving element.
-		/// 
+		///
 		/// The system ensures the minimum height by blocking/limiting <see cref="GridSplitter"/>
 		/// movement when the user resizes a deriving element or resizes the main window.
 		/// </summary>
@@ -308,9 +313,10 @@ double ILayoutPositionableElementWithActualSize.ActualHeight
 		#endregion Properties
 
 		#region Internal Methods
+
 		void ILayoutElementForFloatingWindow.RaiseFloatingPropertiesUpdated() => FloatingPropertiesUpdated?.Invoke(this, EventArgs.Empty);
 
-		#endregion Methods
+		#endregion Internal Methods
 
 		#region Overrides
 
@@ -330,7 +336,6 @@ public override void WriteXml(System.Xml.XmlWriter writer)
 			base.WriteXml(writer);
 		}
 
-
 		public override void ReadXml(System.Xml.XmlReader reader)
 		{
 			if (reader.MoveToAttribute(nameof(DockWidth))) _dockWidth = (GridLength)_gridLengthConverter.ConvertFromInvariantString(reader.Value);
@@ -355,4 +360,4 @@ protected virtual void OnDockHeightChanged()
 
 		#endregion Overrides
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/LayoutRoot.cs b/source/Components/AvalonDock/Layout/LayoutRoot.cs
index e82c9d76..2cad3519 100644
--- a/source/Components/AvalonDock/Layout/LayoutRoot.cs
+++ b/source/Components/AvalonDock/Layout/LayoutRoot.cs
@@ -9,15 +9,15 @@ This program is provided to you under the terms of the Microsoft Public
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Text;
+using System.Windows.Controls;
 using System.Windows.Markup;
-using System.Xml.Serialization;
 using System.Xml;
 using System.Xml.Schema;
-using System.Windows.Controls;
+using System.Xml.Serialization;
 
 namespace AvalonDock.Layout
 {
@@ -25,7 +25,7 @@ namespace AvalonDock.Layout
 	/// Implements the root of the layout viewmodel (see  <see cref="DockingManager.Layout"/> property).
 	/// This root includes a  <see cref="RootPanel"/> property for binding content, side panel properties
 	/// and many other layout related root items.
-	/// 
+	///
 	/// This class implements <see cref="LayoutElement.PropertyChanged"/> and
 	/// <see cref="LayoutElement.PropertyChanging"/> to support direct UI binding scenarios
 	/// with view updates supported.
@@ -35,6 +35,7 @@ namespace AvalonDock.Layout
 	public class LayoutRoot : LayoutElement, ILayoutContainer, ILayoutRoot, IXmlSerializable
 	{
 		#region fields
+
 		private LayoutPanel _rootPanel;
 		private LayoutAnchorSide _topSide = null;
 		private LayoutAnchorSide _rightSide;
@@ -46,6 +47,7 @@ public class LayoutRoot : LayoutElement, ILayoutContainer, ILayoutRoot, IXmlSeri
 
 		[field: NonSerialized]
 		private WeakReference _activeContent = null;
+
 		private bool _activeContentSet = false;
 
 		[field: NonSerialized]
@@ -53,9 +55,11 @@ public class LayoutRoot : LayoutElement, ILayoutContainer, ILayoutRoot, IXmlSeri
 
 		[NonSerialized]
 		private DockingManager _manager = null;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>Standard class constructor</summary>
 		public LayoutRoot()
 		{
@@ -69,6 +73,7 @@ public LayoutRoot()
 		#endregion Constructors
 
 		#region Events
+
 		/// <summary>
 		/// Raised when the layout is updated. This event is raised via <see cref="FireLayoutUpdated()"/> method
 		/// when a parent of a LayoutElement has changed.
@@ -80,9 +85,11 @@ public LayoutRoot()
 
 		/// <summary>Raised when an element is removed from the layout.</summary>
 		public event EventHandler<LayoutElementEventArgs> ElementRemoved;
+
 		#endregion Events
 
 		#region Properties
+
 		/// <summary>Gets/sets the root layout panel that contains the <see cref="LayoutDocumentPane"/>.</summary>
 		public LayoutPanel RootPanel
 		{
@@ -269,6 +276,7 @@ internal set
 				RaisePropertyChanged(nameof(Manager));
 			}
 		}
+
 		#endregion Properties
 
 		#region Overrides
@@ -294,6 +302,7 @@ public override void ConsoleDump(int tab)
 				hidden.ConsoleDump(tab + 1);
 		}
 #endif
+
 		#endregion Overrides
 
 		#region Public Methods
@@ -314,7 +323,6 @@ public void RemoveChild(ILayoutElement element)
 				BottomSide = null;
 			else if (element == LeftSide)
 				LeftSide = null;
-
 		}
 
 		public void ReplaceChild(ILayoutElement oldElement, ILayoutElement newElement)
@@ -349,6 +357,7 @@ public void CollectGarbage()
 			var exitFlag = true;
 
 			#region collect empty panes
+
 			do
 			{
 				exitFlag = true;
@@ -458,9 +467,11 @@ public void CollectGarbage()
 				}
 			}
 			while (!exitFlag);
+
 			#endregion collect empty panes
 
 			#region collapse single child anchorable pane groups
+
 			do
 			{
 				exitFlag = true;
@@ -477,9 +488,11 @@ public void CollectGarbage()
 				}
 			}
 			while (!exitFlag);
+
 			#endregion collapse single child anchorable pane groups
 
 			#region collapse single child document pane groups
+
 			do
 			{
 				exitFlag = true;
@@ -494,9 +507,9 @@ public void CollectGarbage()
 					exitFlag = false;
 					break;
 				}
-
 			}
 			while (!exitFlag);
+
 			#endregion collapse single child document pane groups
 
 			////do
@@ -535,6 +548,7 @@ public void CollectGarbage()
 		}
 
 		#region IXmlSerializable interface members
+
 		/// <inheritdoc />
 		XmlSchema IXmlSerializable.GetSchema() => null;
 
@@ -573,7 +587,7 @@ void IXmlSerializable.ReadXml(XmlReader reader)
 			var hidden = ReadElementList(reader, false);
 			foreach (var hiddenObject in hidden) Hidden.Add((LayoutAnchorable)hiddenObject);
 
-			//Read the closing end element of LayoutRoot 
+			//Read the closing end element of LayoutRoot
 			reader.ReadEndElement();
 		}
 
@@ -620,6 +634,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
 			}
 			writer.WriteEndElement();
 		}
+
 		#endregion IXmlSerializable interface members
 
 		#endregion Public Methods
@@ -685,6 +700,7 @@ private void _floatingWindows_CollectionChanged(object sender, System.Collection
 					RaisePropertyChanged(nameof(Children));
 					RaisePropertyChanged(nameof(ChildrenCount));
 					break;
+
 				case System.Collections.Specialized.NotifyCollectionChangedAction.Replace:
 					RaisePropertyChanged(nameof(Children));
 					break;
@@ -718,7 +734,6 @@ private void _hiddenAnchorables_CollectionChanged(object sender, System.Collecti
 						element.Parent?.RemoveChild(element);
 						element.Parent = this;
 						bNotifyChildren = true;
-
 					}
 				}
 			}
@@ -734,6 +749,7 @@ private void _hiddenAnchorables_CollectionChanged(object sender, System.Collecti
 					RaisePropertyChanged(nameof(Children));
 					RaisePropertyChanged(nameof(ChildrenCount));
 					break;
+
 				case System.Collections.Specialized.NotifyCollectionChangedAction.Replace:
 					RaisePropertyChanged(nameof(Children));
 					break;
@@ -746,7 +762,7 @@ private void InternalSetActiveContent(LayoutContent currentValue, LayoutContent
 			if (currentValue != null && currentValue.IsActive) currentValue.IsActive = false;
 			_activeContent = new WeakReference(newActiveContent);
 			currentValue = ActiveContent;
-			if (currentValue != null&& !currentValue.IsActive) currentValue.IsActive = true;
+			if (currentValue != null && !currentValue.IsActive) currentValue.IsActive = true;
 			RaisePropertyChanged(nameof(ActiveContent));
 			_activeContentSet = currentValue != null;
 			if (currentValue != null)
@@ -809,7 +825,7 @@ private List<ILayoutPanelElement> ReadRootPanel(XmlReader reader
 
 			if (reader.LocalName.Equals(nameof(RootPanel)))
 			{
-				orientation = (Orientation)Enum.Parse(typeof(Orientation),reader.GetAttribute(nameof(Orientation)), true);
+				orientation = (Orientation)Enum.Parse(typeof(Orientation), reader.GetAttribute(nameof(Orientation)), true);
 
 				var canDockStr = reader.GetAttribute("CanDock");
 				if (canDockStr != null)
@@ -850,13 +866,13 @@ private List<object> ReadElementList(XmlReader reader, bool isFloatingWindow)
 			{
 				if (isFloatingWindow)
 				{
-                    if (!(ReadElement(reader) is LayoutFloatingWindow result)) break;
-                    resultList.Add(result);
+					if (!(ReadElement(reader) is LayoutFloatingWindow result)) break;
+					resultList.Add(result);
 				}
 				else
 				{
-                    if (!(ReadElement(reader) is LayoutAnchorable result)) break;
-                    resultList.Add(result);
+					if (!(ReadElement(reader) is LayoutAnchorable result)) break;
+					resultList.Add(result);
 				}
 			}
 
@@ -875,33 +891,43 @@ private object ReadElement(XmlReader reader)
 				case nameof(LayoutAnchorablePaneGroup):
 					serializer = new XmlSerializer(typeof(LayoutAnchorablePaneGroup));
 					break;
+
 				case nameof(LayoutAnchorablePane):
 					serializer = new XmlSerializer(typeof(LayoutAnchorablePane));
 					break;
+
 				case nameof(LayoutAnchorable):
 					serializer = new XmlSerializer(typeof(LayoutAnchorable));
 					break;
+
 				case nameof(LayoutDocumentPaneGroup):
 					serializer = new XmlSerializer(typeof(LayoutDocumentPaneGroup));
 					break;
+
 				case nameof(LayoutDocumentPane):
 					serializer = new XmlSerializer(typeof(LayoutDocumentPane));
 					break;
+
 				case nameof(LayoutDocument):
 					serializer = new XmlSerializer(typeof(LayoutDocument));
 					break;
+
 				case nameof(LayoutAnchorGroup):
 					serializer = new XmlSerializer(typeof(LayoutAnchorGroup));
 					break;
+
 				case nameof(LayoutPanel):
 					serializer = new XmlSerializer(typeof(LayoutPanel));
 					break;
+
 				case nameof(LayoutDocumentFloatingWindow):
 					serializer = new XmlSerializer(typeof(LayoutDocumentFloatingWindow));
 					break;
+
 				case nameof(LayoutAnchorableFloatingWindow):
 					serializer = new XmlSerializer(typeof(LayoutAnchorableFloatingWindow));
 					break;
+
 				case nameof(LeftSide):
 				case nameof(RightSide):
 				case nameof(TopSide):
@@ -912,6 +938,7 @@ private object ReadElement(XmlReader reader)
 						return null;
 					}
 					return reader.Read();
+
 				default:
 					var type = FindType(reader.LocalName);
 					if (type == null)
@@ -928,6 +955,7 @@ private object ReadElement(XmlReader reader)
 		#region Diagnostic tools
 
 #if DEBUG
+
 		public void DumpTree(bool shortPropertyNames = false)
 		{
 			void DumpElement(ILayoutElement element, StringBuilder indent, int childID, bool isLastChild)
@@ -935,12 +963,12 @@ void DumpElement(ILayoutElement element, StringBuilder indent, int childID, bool
 				Debug.Write($"{indent}{(indent.Length > 0 ? isLastChild ? " └─ " : " ├─ " : "")}{childID:D2} 0x{element.GetHashCode():X8} " +
 								$"{element.GetType().Name} {(shortPropertyNames ? "P" : "Parent")}:0x{element.Parent?.GetHashCode() ?? 0:X8} " +
 								$"{(shortPropertyNames ? "R" : "Root")}:0x{element.Root?.GetHashCode() ?? 0:X8}");
-                if (!(element is ILayoutContainer containerElement))
-                {
-                    Debug.WriteLine("");
-                    return;
-                }
-                Debug.WriteLine($" {(shortPropertyNames ? "C" : "Children")}:{containerElement.ChildrenCount}");
+				if (!(element is ILayoutContainer containerElement))
+				{
+					Debug.WriteLine("");
+					return;
+				}
+				Debug.WriteLine($" {(shortPropertyNames ? "C" : "Children")}:{containerElement.ChildrenCount}");
 				var nrChild = 0;
 				indent.Append(isLastChild ? "   " : " │ ");
 				foreach (var child in containerElement.Children)
@@ -953,8 +981,9 @@ void DumpElement(ILayoutElement element, StringBuilder indent, int childID, bool
 
 			DumpElement(this, new StringBuilder(), 0, true);
 		}
+
 #endif
 
 		#endregion Diagnostic tools
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/NamespaceDoc.cs b/source/Components/AvalonDock/Layout/NamespaceDoc.cs
index f1bf0fa6..2c8eb3b8 100644
--- a/source/Components/AvalonDock/Layout/NamespaceDoc.cs
+++ b/source/Components/AvalonDock/Layout/NamespaceDoc.cs
@@ -5,4 +5,4 @@ namespace AvalonDock.Layout
 	internal class NamespaceDoc
 	{
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs b/source/Components/AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs
index 18926719..976d1d0e 100644
--- a/source/Components/AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs
+++ b/source/Components/AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs
@@ -15,15 +15,16 @@ namespace AvalonDock.Layout.Serialization
 	/// Implements an event that can be used to communicate between deserialization method
 	/// and client application that a new item (LayoutAnchorable or Document) is about to
 	/// be constructed and should be attached to a corresponding viewmodel.
-	/// 
+	///
 	/// The client application can use this event to Cancel reloading the item or
 	/// attach (a viewmodel) content to the view item that is about to be reloaded and presented in the UI.
-	/// 
+	///
 	/// Use the Cancel property to indicate the case in which an item should not be deserialized.
 	/// </summary>
 	public class LayoutSerializationCallbackEventArgs : CancelEventArgs
 	{
 		#region constructors
+
 		/// <summary>
 		/// Class constructor from <see cref="LayoutContent"/> and <paramref name="previousContent"/> object.
 		/// </summary>
@@ -39,6 +40,7 @@ public LayoutSerializationCallbackEventArgs(LayoutContent model, object previous
 		#endregion constructors
 
 		#region Properties
+
 		/// <summary>
 		/// Gets the model of the view that is about to be deserialized.
 		/// </summary>
@@ -54,4 +56,4 @@ public LayoutContent Model
 
 		#endregion Properties
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/Serialization/LayoutSerializer.cs b/source/Components/AvalonDock/Layout/Serialization/LayoutSerializer.cs
index c679592f..7e7d0466 100644
--- a/source/Components/AvalonDock/Layout/Serialization/LayoutSerializer.cs
+++ b/source/Components/AvalonDock/Layout/Serialization/LayoutSerializer.cs
@@ -16,11 +16,14 @@ namespace AvalonDock.Layout.Serialization
 	public abstract class LayoutSerializer
 	{
 		#region fields
+
 		private LayoutAnchorable[] _previousAnchorables = null;
 		private LayoutDocument[] _previousDocuments = null;
+
 		#endregion fields
 
 		#region Constructors
+
 		/// <summary>
 		/// Class constructor from <see cref="DockingManager"/> instance.
 		/// </summary>
@@ -31,17 +34,21 @@ public LayoutSerializer(DockingManager manager)
 			_previousAnchorables = Manager.Layout.Descendents().OfType<LayoutAnchorable>().ToArray();
 			_previousDocuments = Manager.Layout.Descendents().OfType<LayoutDocument>().ToArray();
 		}
+
 		#endregion Constructors
 
 		#region Events
+
 		/// <summary>Raises an event when the layout serializer is about to deserialize an item to ask the
 		/// client application whether the item should be deserialized and re-displayed and what content
 		/// should be used if so.
 		/// </summary>
 		public event EventHandler<LayoutSerializationCallbackEventArgs> LayoutSerializationCallback;
+
 		#endregion Events
 
 		#region Properties
+
 		/// <summary>
 		/// Gets the <see cref="DockingManager"/> root of the docking library.
 		/// </summary>
@@ -113,7 +120,7 @@ protected virtual void FixupLayout(LayoutRoot layout)
 				else if (previousDocument == null)  // No Callback and no provious document -> skip this
 					lcToFix.Close();
 				else
-				{	// No Callback but previous document available -> load content from previous document
+				{   // No Callback but previous document available -> load content from previous document
 					lcToFix.Content = previousDocument.Content;
 					lcToFix.IconSource = previousDocument.IconSource;
 				}
@@ -133,6 +140,7 @@ protected void EndDeserialization()
 			Manager.SuspendDocumentsSourceBinding = false;
 			Manager.SuspendAnchorablesSourceBinding = false;
 		}
+
 		#endregion Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/Serialization/NamespaceDoc.cs b/source/Components/AvalonDock/Layout/Serialization/NamespaceDoc.cs
index a061bb6a..0c1edecb 100644
--- a/source/Components/AvalonDock/Layout/Serialization/NamespaceDoc.cs
+++ b/source/Components/AvalonDock/Layout/Serialization/NamespaceDoc.cs
@@ -5,4 +5,4 @@ namespace AvalonDock.Layout.Serialization
 	internal class NamespaceDoc
 	{
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs b/source/Components/AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs
index 434317f4..438c472f 100644
--- a/source/Components/AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs
+++ b/source/Components/AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs
@@ -7,9 +7,9 @@ This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
  ************************************************************************/
 
-using System.Xml.Serialization;
 using System.IO;
 using System.Xml;
+using System.Xml.Serialization;
 
 namespace AvalonDock.Layout.Serialization
 {
@@ -17,6 +17,7 @@ namespace AvalonDock.Layout.Serialization
 	public class XmlLayoutSerializer : LayoutSerializer
 	{
 		#region Constructors
+
 		/// <summary>
 		/// Class constructor from <see cref="DockingManager"/> instance.
 		/// </summary>
@@ -25,9 +26,11 @@ public XmlLayoutSerializer(DockingManager manager)
 			: base(manager)
 		{
 		}
+
 		#endregion Constructors
 
 		#region Public Methods
+
 		/// <summary>Serialize the layout into a <see cref="XmlWriter"/>.</summary>
 		/// <param name="writer"></param>
 		public void Serialize(XmlWriter writer)
@@ -60,7 +63,6 @@ public void Serialize(string filepath)
 				Serialize(stream);
 		}
 
-
 		/// <summary>Deserialize the layout a file from a <see cref="Stream"/>.</summary>
 		/// <param name="stream"></param>
 		public void Deserialize(System.IO.Stream stream)
@@ -125,4 +127,4 @@ public void Deserialize(string filepath)
 
 		#endregion Public Methods
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/MathHelper.cs b/source/Components/AvalonDock/MathHelper.cs
index 49409126..04bb3e81 100644
--- a/source/Components/AvalonDock/MathHelper.cs
+++ b/source/Components/AvalonDock/MathHelper.cs
@@ -19,7 +19,7 @@ internal static class MathHelper
 		/// <summary>
 		/// Ensures that <paramref name="min"/> is greater <paramref name="max"/> via Exception (if not)
 		/// and returns a valid value inside the given bounds.
-		/// 
+		///
 		/// That is, (<paramref name="min"/> or <paramref name="max"/> is returned if
 		/// <paramref name="value"/> is out of bounds, <paramref name="value"/> is returned otherwise.
 		/// </summary>
@@ -43,4 +43,4 @@ public static void AssertIsPositiveOrZero(double value)
 			if (value < 0.0) throw new ArgumentException("Invalid value, must be a positive number or equal to zero", nameof(value));
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Themes/DictionaryTheme.cs b/source/Components/AvalonDock/Themes/DictionaryTheme.cs
deleted file mode 100644
index 96636495..00000000
--- a/source/Components/AvalonDock/Themes/DictionaryTheme.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/************************************************************************
-   AvalonDock
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at https://opensource.org/licenses/MS-PL
- ************************************************************************/
-
-using System;
-using System.Windows;
-
-namespace AvalonDock.Themes
-{
-	/// <summary>
-	/// Defines an abstract class to implement a custom AvalonDock theme
-	/// based on a <see cref="ResourceDictionary"/> object rather than an XAML Uri.
-	/// 
-	/// Dirk: Class is referenced in code but is never used since there is no concrete inheriting class.
-	/// ToDo: Remove this class and code references in AvalonDock?
-	/// </summary>
-	public abstract class DictionaryTheme : Theme
-	{
-		#region Constructors
-		/// <summary>
-		/// Class constructor
-		/// </summary>
-		public DictionaryTheme()
-		{
-		}
-
-		/// <summary>
-		/// Class constructor from theme specific resource dictionary.
-		/// </summary>
-		/// <param name="themeResourceDictionary"></param>
-		public DictionaryTheme(ResourceDictionary themeResourceDictionary)
-		{
-			this.ThemeResourceDictionary = themeResourceDictionary;
-		}
-
-		#endregion Constructors
-		/// <summary>
-		/// Gets the resource dictionary that is associated with this AvalonDock theme.
-		/// </summary>
-		public ResourceDictionary ThemeResourceDictionary { get; private set; }
-
-		/// <inheritdoc/>
-		public override Uri GetResourceUri()
-		{
-			return null;
-		}
-	}
-}
diff --git a/source/Components/AvalonDock/Win32Helper.cs b/source/Components/AvalonDock/Win32Helper.cs
index a865e74a..ce2cc9dc 100644
--- a/source/Components/AvalonDock/Win32Helper.cs
+++ b/source/Components/AvalonDock/Win32Helper.cs
@@ -25,7 +25,6 @@ internal const int
 				  WS_TABSTOP = 0x00010000,
 				  WS_GROUP = 0x00020000;
 
-
 		/// <summary>SetWindowPos Flags.</summary>
 		/// <seealso href="https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setwindowpos"/>
 		[Flags]
@@ -36,54 +35,68 @@ internal enum SetWindowPosFlags : uint
 			/// blocking its execution while other threads process the request.</summary>
 			/// <remarks>SWP_ASYNCWINDOWPOS</remarks>
 			SynchronousWindowPosition = 0x4000,
+
 			/// <summary>Prevents generation of the WM_SYNCPAINT message.</summary>
 			/// <remarks>SWP_DEFERERASE</remarks>
 			DeferErase = 0x2000,
+
 			/// <summary>Draws a frame (defined in the window's class description) around the window.</summary>
 			/// <remarks>SWP_DRAWFRAME</remarks>
 			DrawFrame = 0x0020,
+
 			/// <summary>Applies new frame styles set using the SetWindowLong function. Sends a WM_NCCALCSIZE message to
 			/// the window, even if the window's size is not being changed. If this flag is not specified, WM_NCCALCSIZE
 			/// is sent only when the window's size is being changed.</summary>
 			/// <remarks>SWP_FRAMECHANGED</remarks>
 			FrameChanged = 0x0020,
+
 			/// <summary>Hides the window.</summary>
 			/// <remarks>SWP_HIDEWINDOW</remarks>
 			HideWindow = 0x0080,
+
 			/// <summary>Does not activate the window. If this flag is not set, the window is activated and moved to the
 			/// top of either the topmost or non-topmost group (depending on the setting of the hWndInsertAfter
 			/// parameter).</summary>
 			/// <remarks>SWP_NOACTIVATE</remarks>
 			DoNotActivate = 0x0010,
+
 			/// <summary>Discards the entire contents of the client area. If this flag is not specified, the valid
 			/// contents of the client area are saved and copied back into the client area after the window is sized or
 			/// repositioned.</summary>
 			/// <remarks>SWP_NOCOPYBITS</remarks>
 			DoNotCopyBits = 0x0100,
+
 			/// <summary>Retains the current position (ignores X and Y parameters).</summary>
 			/// <remarks>SWP_NOMOVE</remarks>
 			IgnoreMove = 0x0002,
+
 			/// <summary>Does not change the owner window's position in the Z order.</summary>
 			/// <remarks>SWP_NOOWNERZORDER</remarks>
 			DoNotChangeOwnerZOrder = 0x0200,
+
 			/// <summary>Does not redraw changes. If this flag is set, no repainting of any kind occurs. This applies to
 			/// the client area, the nonclient area (including the title bar and scroll bars), and any part of the parent
 			/// window uncovered as a result of the window being moved. When this flag is set, the application must
 			/// explicitly invalidate or redraw any parts of the window and parent window that need redrawing.</summary>
 			/// <remarks>SWP_NOREDRAW</remarks>
 			DoNotRedraw = 0x0008,
+
 			/// <summary>Same as the SWP_NOOWNERZORDER flag.</summary>
 			/// <remarks>SWP_NOREPOSITION</remarks>
 			DoNotReposition = 0x0200,
+
 			/// <summary>Prevents the window from receiving the WM_WINDOWPOSCHANGING message.</summary>
 			/// <remarks>SWP_NOSENDCHANGING</remarks>
 			DoNotSendChangingEvent = 0x0400,
+
 			/// <summary>Retains the current size (ignores the cx and cy parameters).</summary>
 			/// <remarks>SWP_NOSIZE</remarks>
 			IgnoreResize = 0x0001,
+
 			/// <summary>Retains the current Z order (ignores the hWndInsertAfter parameter).</summary>
 			/// <remarks>SWP_NOZORDER</remarks>
 			IgnoreZOrder = 0x0004,
+
 			/// <summary>Displays the window.</summary>
 			/// <remarks>SWP_SHOWWINDOW</remarks>
 			ShowWindow = 0x0040,
@@ -93,6 +106,7 @@ internal enum SetWindowPosFlags : uint
 		///     Special window handles
 		/// </summary>
 		internal static readonly IntPtr HWND_TOPMOST = new IntPtr(-1);
+
 		internal static readonly IntPtr HWND_NOTOPMOST = new IntPtr(-2);
 		internal static readonly IntPtr HWND_TOP = new IntPtr(0);
 		internal static readonly IntPtr HWND_BOTTOM = new IntPtr(1);
@@ -143,8 +157,10 @@ internal class WINDOWPOS
 		internal const int WA_INACTIVE = 0x0000;
 
 		internal const int WM_SYSCOMMAND = 0x0112;
+
 		// These are the wParam of WM_SYSCOMMAND
 		internal const int SC_MAXIMIZE = 0xF030;
+
 		internal const int SC_RESTORE = 0xF120;
 
 		internal const int
@@ -160,16 +176,17 @@ internal const int
 
 		[DllImportAttribute("user32.dll")]
 		internal static extern int SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+
 		[DllImportAttribute("user32.dll")]
 		internal static extern int PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
 
-
 		[DllImport("user32.dll")]
-		static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+		private static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+
 		[DllImport("user32.dll")]
 		internal static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
 
-		// Hook Types  
+		// Hook Types
 		public enum HookType : int
 		{
 			WH_JOURNALRECORD = 0,
@@ -203,8 +220,10 @@ public static extern IntPtr SetWindowsHookEx(HookType code,
 			HookProc func,
 			IntPtr hInstance,
 			int threadID);
+
 		[DllImport("user32.dll")]
 		public static extern int UnhookWindowsHookEx(IntPtr hhook);
+
 		[DllImport("user32.dll")]
 		public static extern int CallNextHookEx(IntPtr hhook,
 			int code, IntPtr wParam, IntPtr lParam);
@@ -216,6 +235,7 @@ internal struct RECT
 			public int Top;
 			public int Right;
 			public int Bottom;
+
 			public RECT(int left_, int top_, int right_, int bottom_)
 			{
 				Left = left_;
@@ -239,6 +259,7 @@ public int Width
 					return Right - Left;
 				}
 			}
+
 			public Size Size
 			{
 				get
@@ -255,7 +276,7 @@ public Point Location
 				}
 			}
 
-			// Handy method for converting to a System.Drawing.Rectangle  
+			// Handy method for converting to a System.Drawing.Rectangle
 			public Rect ToRectangle()
 			{
 				return new Rect(Left, Top, Right, Bottom);
@@ -272,14 +293,17 @@ public override int GetHashCode()
 			}
 
 			#region Operator overloads
+
 			public static implicit operator Rect(RECT rect)
 			{
 				return rect.ToRectangle();
 			}
+
 			public static implicit operator RECT(Rect rect)
 			{
 				return FromRectangle(rect);
 			}
+
 			#endregion Operator overloads
 		}
 
@@ -301,7 +325,6 @@ internal static RECT GetWindowRect(IntPtr hWnd)
 		internal const uint GW_HWNDNEXT = 2;
 		internal const uint GW_HWNDPREV = 3;
 
-
 		[DllImport("user32.dll", SetLastError = true)]
 		internal static extern IntPtr GetWindow(IntPtr hWnd, uint uCmd);
 
@@ -321,7 +344,6 @@ internal static int MakeLParam(int LoWord, int HiWord)
 			return (int)((HiWord << 16) | (LoWord & 0xffff));
 		}
 
-
 		internal const int WM_MOUSEMOVE = 0x200;
 		internal const int WM_LBUTTONDOWN = 0x201;
 		internal const int WM_LBUTTONUP = 0x202;
@@ -335,7 +357,6 @@ internal static int MakeLParam(int LoWord, int HiWord)
 		internal const int WM_MOUSEWHEEL = 0x20A;
 		internal const int WM_MOUSEHWHEEL = 0x20E;
 
-
 		[DllImport("user32.dll")]
 		[return: MarshalAs(UnmanagedType.Bool)]
 		internal static extern bool GetCursorPos(ref Win32Point pt);
@@ -346,6 +367,7 @@ internal struct Win32Point
 			public Int32 X;
 			public Int32 Y;
 		};
+
 		internal static Point GetMousePosition()
 		{
 			Win32Point w32Mouse = new Win32Point();
@@ -353,10 +375,10 @@ internal static Point GetMousePosition()
 			return new Point(w32Mouse.X, w32Mouse.Y);
 		}
 
-
 		[DllImport("user32.dll")]
 		[return: MarshalAs(UnmanagedType.Bool)]
 		internal static extern bool IsWindowVisible(IntPtr hWnd);
+
 		[DllImport("user32.dll")]
 		[return: MarshalAs(UnmanagedType.Bool)]
 		internal static extern bool IsWindowEnabled(IntPtr hWnd);
@@ -383,10 +405,10 @@ internal static Point GetMousePosition()
 		/// <returns>If the function succeeds, the return value is the previous value of the specified 32-bit integer.
 		/// If the function fails, the return value is zero. To get extended error information, call GetLastError. </returns>
 		[DllImport("user32.dll")]
-		static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+		private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
 
 		[DllImport("user32.dll", SetLastError = true)]
-		static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+		private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
 
 		public static void SetOwner(IntPtr childHandle, IntPtr ownerHandle)
 		{
@@ -401,19 +423,18 @@ public static IntPtr GetOwner(IntPtr childHandle)
 			return new IntPtr(GetWindowLong(childHandle, -8));
 		}
 
-
 		//Monitor Patch #13440
 
 		/// <summary>
-		/// The MonitorFromRect function retrieves a handle to the display monitor that 
+		/// The MonitorFromRect function retrieves a handle to the display monitor that
 		/// has the largest area of intersection with a specified rectangle.
 		/// </summary>
-		/// <param name="lprc">Pointer to a RECT structure that specifies the rectangle of interest in 
+		/// <param name="lprc">Pointer to a RECT structure that specifies the rectangle of interest in
 		/// virtual-screen coordinates</param>
-		/// <param name="dwFlags">Determines the function's return value if the rectangle does not intersect 
+		/// <param name="dwFlags">Determines the function's return value if the rectangle does not intersect
 		/// any display monitor</param>
 		/// <returns>
-		/// If the rectangle intersects one or more display monitor rectangles, the return value 
+		/// If the rectangle intersects one or more display monitor rectangles, the return value
 		/// is an HMONITOR handle to the display monitor that has the largest area of intersection with the rectangle.
 		/// If the rectangle does not intersect a display monitor, the return value depends on the value of dwFlags.
 		/// </returns>
@@ -421,17 +442,16 @@ public static IntPtr GetOwner(IntPtr childHandle)
 		public static extern IntPtr MonitorFromRect([In] ref RECT lprc, uint dwFlags);
 
 		/// <summary>
-		/// The MonitorFromWindow function retrieves a handle to the display monitor that has the largest area of intersection with the bounding rectangle of a specified window. 
+		/// The MonitorFromWindow function retrieves a handle to the display monitor that has the largest area of intersection with the bounding rectangle of a specified window.
 		/// </summary>
 		/// <param name="hwnd">A handle to the window of interest.</param>
 		/// <param name="dwFlags">Determines the function's return value if the window does not intersect any display monitor.</param>
-		/// <returns>If the window intersects one or more display monitor rectangles, the return value is an HMONITOR handle to the display monitor that has the largest area of intersection with the window. 
+		/// <returns>If the window intersects one or more display monitor rectangles, the return value is an HMONITOR handle to the display monitor that has the largest area of intersection with the window.
 		/// If the window does not intersect a display monitor, the return value depends on the value of dwFlags.
 		/// </returns>
 		[DllImport("user32.dll")]
 		public static extern IntPtr MonitorFromWindow(IntPtr hwnd, uint dwFlags);
 
-
 		/// <summary>
 		/// The MONITORINFO structure contains information about a display monitor.
 		/// </summary>
@@ -439,33 +459,36 @@ public static IntPtr GetOwner(IntPtr childHandle)
 		public class MonitorInfo
 		{
 			/// <summary>
-			/// The size of the structure, in bytes. 
+			/// The size of the structure, in bytes.
 			/// </summary>
 			public int Size = Marshal.SizeOf(typeof(MonitorInfo));
+
 			/// <summary>
-			/// A RECT structure that specifies the display monitor rectangle, expressed 
-			/// in virtual-screen coordinates. 
-			/// Note that if the monitor is not the primary display monitor, 
-			/// some of the rectangle's coordinates may be negative values. 
+			/// A RECT structure that specifies the display monitor rectangle, expressed
+			/// in virtual-screen coordinates.
+			/// Note that if the monitor is not the primary display monitor,
+			/// some of the rectangle's coordinates may be negative values.
 			/// </summary>
 			public RECT Monitor;
+
 			/// <summary>
-			/// A RECT structure that specifies the work area rectangle of the display monitor, 
-			/// expressed in virtual-screen coordinates. Note that if the monitor is not the primary 
+			/// A RECT structure that specifies the work area rectangle of the display monitor,
+			/// expressed in virtual-screen coordinates. Note that if the monitor is not the primary
 			/// display monitor, some of the rectangle's coordinates may be negative values.
 			/// </summary>
 			public RECT Work;
+
 			/// <summary>
-			/// A set of flags that represent attributes of the display monitor. 
+			/// A set of flags that represent attributes of the display monitor.
 			/// </summary>
 			public uint Flags;
 		}
 
 		/// <summary>
-		/// The GetMonitorInfo function retrieves information about a display monitor. 
+		/// The GetMonitorInfo function retrieves information about a display monitor.
 		/// </summary>
 		/// <param name="hMonitor">Handle to the display monitor of interest.</param>
-		/// <param name="lpmi">Pointer to a MONITORINFO or MONITORINFOEX structure that receives 
+		/// <param name="lpmi">Pointer to a MONITORINFO or MONITORINFOEX structure that receives
 		/// information about the specified display monitor</param>
 		/// <returns>If the function succeeds, the return value is nonzero.
 		/// If the function fails, the return value is zero.</returns>
@@ -473,4 +496,4 @@ public class MonitorInfo
 		[return: MarshalAs(UnmanagedType.Bool)]
 		public static extern bool GetMonitorInfo(IntPtr hMonitor, [In, Out] MonitorInfo lpmi);
 	}
-}
+}
\ No newline at end of file
diff --git a/source/Components/AvalonDock/WindowHelper.cs b/source/Components/AvalonDock/WindowHelper.cs
index 01c6b96d..1bed8808 100644
--- a/source/Components/AvalonDock/WindowHelper.cs
+++ b/source/Components/AvalonDock/WindowHelper.cs
@@ -8,13 +8,13 @@ This program is provided to you under the terms of the Microsoft Public
  ************************************************************************/
 
 using System;
-using System.Windows.Media;
 using System.Windows;
 using System.Windows.Interop;
+using System.Windows.Media;
 
 namespace AvalonDock
 {
-	static class WindowHelper
+	internal static class WindowHelper
 	{
 		public static bool IsAttachedToPresentationSource(this Visual element)
 		{
@@ -28,9 +28,9 @@ public static void SetParentToMainWindowOf(this Window window, Visual element)
 				window.Owner = wndParent;
 			else
 			{
-                if (GetParentWindowHandle(element, out IntPtr parentHwnd))
-                    Win32Helper.SetOwner(new WindowInteropHelper(window).Handle, parentHwnd);
-            }
+				if (GetParentWindowHandle(element, out IntPtr parentHwnd))
+					Win32Helper.SetOwner(new WindowInteropHelper(window).Handle, parentHwnd);
+			}
 		}
 
 		public static IntPtr GetParentWindowHandle(this Window window)
@@ -41,15 +41,14 @@ public static IntPtr GetParentWindowHandle(this Window window)
 				return Win32Helper.GetOwner(new WindowInteropHelper(window).Handle);
 		}
 
-
 		public static bool GetParentWindowHandle(this Visual element, out IntPtr hwnd)
 		{
 			hwnd = IntPtr.Zero;
 
-            if (!(PresentationSource.FromVisual(element) is HwndSource wpfHandle))
-                return false;
+			if (!(PresentationSource.FromVisual(element) is HwndSource wpfHandle))
+				return false;
 
-            hwnd = Win32Helper.GetParent(wpfHandle.Handle);
+			hwnd = Win32Helper.GetParent(wpfHandle.Handle);
 			if (hwnd == IntPtr.Zero)
 				hwnd = wpfHandle.Handle;
 			return true;
@@ -65,4 +64,4 @@ public static void SetParentWindowToNull(this Window window)
 			}
 		}
 	}
-}
+}
\ No newline at end of file