From d16dd36cd55c36a090fb30ba37e82c2ba1df1597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=A2=D1=80=D1=83=D1=88=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2?= <oleg_trushkov@hotmail.com>
Date: Tue, 22 Jun 2021 17:17:49 +0300
Subject: [PATCH 1/8] Created test project.

---
 source/AvalonDock.sln               |  19 ++-
 source/VS2013Test/App.xaml          |  10 ++
 source/VS2013Test/App.xaml.cs       |  17 +++
 source/VS2013Test/AssemblyInfo.cs   |  10 ++
 source/VS2013Test/MainView.xaml     | 209 ++++++++++++++++++++++++++++
 source/VS2013Test/MainView.xaml.cs  |  48 +++++++
 source/VS2013Test/MainViewModel.cs  |  12 ++
 source/VS2013Test/VS2013Test.csproj |  13 ++
 8 files changed, 336 insertions(+), 2 deletions(-)
 create mode 100644 source/VS2013Test/App.xaml
 create mode 100644 source/VS2013Test/App.xaml.cs
 create mode 100644 source/VS2013Test/AssemblyInfo.cs
 create mode 100644 source/VS2013Test/MainView.xaml
 create mode 100644 source/VS2013Test/MainView.xaml.cs
 create mode 100644 source/VS2013Test/MainViewModel.cs
 create mode 100644 source/VS2013Test/VS2013Test.csproj

diff --git a/source/AvalonDock.sln b/source/AvalonDock.sln
index 598de4ca..c9927a51 100644
--- a/source/AvalonDock.sln
+++ b/source/AvalonDock.sln
@@ -26,7 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock.Themes.Aero", "C
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutomationTest", "AutomationTest", "{20876020-CC7D-46BD-9B80-E4F01FC0FD31}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDockTest", "AutomationTest\AvalonDockTest\AvalonDockTest.csproj", "{FE4E16A2-876A-4356-9974-8A89C50B2A5A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDockTest", "AutomationTest\AvalonDockTest\AvalonDockTest.csproj", "{FE4E16A2-876A-4356-9974-8A89C50B2A5A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceLocator", "MLibTest\MLibTest_Components\ServiceLocator\ServiceLocator.csproj", "{38F7F15D-2F13-49E4-B4E6-B9552072AFCD}"
 EndProject
@@ -40,7 +40,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinFormsTestApp", "WinForms
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDocPanelMemoryLeaks", "AvalonDocPanelMemoryLeaks\AvalonDocPanelMemoryLeaks.csproj", "{5543BFED-827A-4404-8066-3FFDB201DDF0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaliburnDockTestApp", "CaliburnDockTestApp\CaliburnDockTestApp.csproj", "{F8AEE594-DB5E-4DB8-9F45-4969CA5F8EF1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaliburnDockTestApp", "CaliburnDockTestApp\CaliburnDockTestApp.csproj", "{F8AEE594-DB5E-4DB8-9F45-4969CA5F8EF1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VS2013Test", "VS2013Test\VS2013Test.csproj", "{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -244,6 +246,18 @@ Global
 		{F8AEE594-DB5E-4DB8-9F45-4969CA5F8EF1}.Release|x64.Build.0 = Release|Any CPU
 		{F8AEE594-DB5E-4DB8-9F45-4969CA5F8EF1}.Release|x86.ActiveCfg = Release|Any CPU
 		{F8AEE594-DB5E-4DB8-9F45-4969CA5F8EF1}.Release|x86.Build.0 = Release|Any CPU
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}.Debug|x64.Build.0 = Debug|Any CPU
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}.Debug|x86.Build.0 = Debug|Any CPU
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}.Release|x64.ActiveCfg = Release|Any CPU
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}.Release|x64.Build.0 = Release|Any CPU
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}.Release|x86.ActiveCfg = Release|Any CPU
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -267,6 +281,7 @@ Global
 		{2433B8AF-0788-4C86-8FDD-E3BCB62E2157} = {1D267DDB-F2DE-4B70-87C1-E93A0C2D73F4}
 		{5543BFED-827A-4404-8066-3FFDB201DDF0} = {1D267DDB-F2DE-4B70-87C1-E93A0C2D73F4}
 		{F8AEE594-DB5E-4DB8-9F45-4969CA5F8EF1} = {1D267DDB-F2DE-4B70-87C1-E93A0C2D73F4}
+		{12C5DFE9-27AE-4BAB-9050-617F8A7FC52E} = {1D267DDB-F2DE-4B70-87C1-E93A0C2D73F4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {459B8289-CF04-4E70-AEC9-23DC3A6E66F6}
diff --git a/source/VS2013Test/App.xaml b/source/VS2013Test/App.xaml
new file mode 100644
index 00000000..53e54a34
--- /dev/null
+++ b/source/VS2013Test/App.xaml
@@ -0,0 +1,10 @@
+<Application x:Class="VS2013Test.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:VS2013Test"
+             StartupUri="MainView.xaml">
+	
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/source/VS2013Test/App.xaml.cs b/source/VS2013Test/App.xaml.cs
new file mode 100644
index 00000000..7a538cdc
--- /dev/null
+++ b/source/VS2013Test/App.xaml.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace VS2013Test
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}
diff --git a/source/VS2013Test/AssemblyInfo.cs b/source/VS2013Test/AssemblyInfo.cs
new file mode 100644
index 00000000..8b5504ec
--- /dev/null
+++ b/source/VS2013Test/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/source/VS2013Test/MainView.xaml b/source/VS2013Test/MainView.xaml
new file mode 100644
index 00000000..a58ece00
--- /dev/null
+++ b/source/VS2013Test/MainView.xaml
@@ -0,0 +1,209 @@
+<Window x:Class="VS2013Test.MainView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:VS2013Test"
+        mc:Ignorable="d"
+        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="450" Width="800" SnapsToDevicePixels="True" Foreground="White" Background="#2d2d30" BorderThickness="1" WindowStyle="None" ResizeMode="CanResize">
+
+	<Window.DataContext>
+		<local:MainViewModel/>
+	</Window.DataContext>
+
+	<WindowChrome.WindowChrome>
+		<WindowChrome CaptionHeight="33" ResizeBorderThickness="8" CornerRadius="0" GlassFrameThickness="0" NonClientFrameEdges="None" />
+	</WindowChrome.WindowChrome>
+
+	<Window.Resources>
+		<Style x:Key="CloseButton" TargetType="{x:Type Button}">
+			<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+			<Setter Property="IsTabStop" Value="False"/>
+			<Setter Property="Focusable" Value="False"/>
+			<Setter Property="ToolTip" Value="Close"/>
+			<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
+			<Setter Property="Foreground" Value="White"/>
+			<Setter Property="Template">
+				<Setter.Value>
+					<ControlTemplate TargetType="{x:Type Button}">
+						<Border Background="{TemplateBinding Background}">
+							<Path Width="46" Height="32" StrokeThickness="1" Stroke="{TemplateBinding Foreground}" Data="M 18,11 27,20 M 18,20 27,11"/>
+						</Border>
+
+						<ControlTemplate.Triggers>
+							<Trigger Property="IsMouseOver" Value="True">
+								<Setter Property="Background" Value="#393939"/>
+							</Trigger>
+							<Trigger Property="IsPressed" Value="true">
+								<Setter Property="Background" Value="#1982C4"/>
+							</Trigger>
+							<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+								<Setter Property="Foreground" Value="#818181" />
+							</DataTrigger>
+						</ControlTemplate.Triggers>
+					</ControlTemplate>
+				</Setter.Value>
+			</Setter>
+		</Style>
+
+		<Style x:Key="MaximizeButton" TargetType="{x:Type Button}">
+			<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+			<Setter Property="ToolTip" Value="Maximize"/>
+			<Setter Property="IsTabStop" Value="False"/>
+			<Setter Property="Focusable" Value="False"/>
+			<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
+			<Setter Property="Foreground" Value="White"/>
+			<Setter Property="Template">
+				<Setter.Value>
+					<ControlTemplate TargetType="{x:Type Button}">
+						<Border Background="{TemplateBinding Background}">
+							<Path x:Name="MaximizePath" Width="46" Height="32" Data="M 18.5,10.5 H 27.5 V 19.5 H 18.5 Z" Stroke="{TemplateBinding Foreground}" StrokeThickness="1" />
+						</Border>
+
+						<ControlTemplate.Triggers>
+							<Trigger Property="IsMouseOver" Value="True">
+								<Setter Property="Background" Value="#393939"/>
+							</Trigger>
+							<Trigger Property="IsPressed" Value="true">
+								<Setter Property="Background" Value="#1982C4"/>
+							</Trigger>
+							<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="Maximized">
+								<Setter Property="Visibility" Value="Collapsed"/>
+							</DataTrigger>
+							<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+								<Setter Property="Foreground" Value="#818181" />
+							</DataTrigger>
+						</ControlTemplate.Triggers>
+					</ControlTemplate>
+				</Setter.Value>
+			</Setter>
+		</Style>
+
+		<!--Прямоугольная кнопка нормального режима на панели состояния-->
+		<Style x:Key="RestoreDownButton" TargetType="{x:Type Button}">
+			<Setter Property="Visibility" Value="Collapsed"/>
+			<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+			<Setter Property="IsTabStop" Value="False"/>
+			<Setter Property="Focusable" Value="False"/>
+			<Setter Property="ToolTip" Value="Restore Down"/>
+			<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
+			<Setter Property="Foreground" Value="White"/>
+			<Setter Property="Template">
+				<Setter.Value>
+					<ControlTemplate TargetType="{x:Type Button}">
+						<Border Background="{TemplateBinding Background}">
+							<Path x:Name="RestoreDownPath" Width="46" Height="32" Data="M 18.5,12.5 H 25.5 V 19.5 H 18.5 Z M 20.5,12.5 V 10.5 H 27.5 V 17.5 H 25.5" Stroke="{TemplateBinding Foreground}" StrokeThickness="1" />
+						</Border>
+
+						<ControlTemplate.Triggers>
+							<Trigger Property="IsMouseOver" Value="True">
+								<Setter Property="Background" Value="#393939"/>
+							</Trigger>
+							<Trigger Property="IsPressed" Value="true">
+								<Setter Property="Background" Value="#1982C4"/>
+							</Trigger>
+							<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="Maximized">
+								<Setter Property="Visibility" Value="Visible"/>
+							</DataTrigger>
+							<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+								<Setter Property="Foreground" Value="#818181" />
+							</DataTrigger>
+						</ControlTemplate.Triggers>
+					</ControlTemplate>
+				</Setter.Value>
+			</Setter>
+		</Style>
+
+		<!--Прямоугольная кнопка сворачивания на панели состояния-->
+		<Style x:Key="MinimizeButton" TargetType="{x:Type Button}">
+			<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+			<Setter Property="RenderOptions.EdgeMode" Value="Aliased"/>
+			<Setter Property="IsTabStop" Value="False"/>
+			<Setter Property="Focusable" Value="False"/>
+			<Setter Property="ToolTip" Value="Minimize"/>
+			<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
+			<Setter Property="Foreground" Value="White"/>
+			<Setter Property="Template">
+				<Setter.Value>
+					<ControlTemplate TargetType="{x:Type Button}">
+						<Border Background="{TemplateBinding Background}">
+							<Path Width="46" Height="32" StrokeThickness="1" Stroke="{TemplateBinding Foreground}" Data="M 18,15 H 28"/>
+						</Border>
+
+						<ControlTemplate.Triggers>
+							<Trigger Property="IsMouseOver" Value="True">
+								<Setter Property="Background" Value="#393939"/>
+							</Trigger>
+							<MultiTrigger>
+								<MultiTrigger.Conditions>
+									<Condition Property="IsMouseOver" Value="True" />
+									<Condition Property="IsPressed" Value="True" />
+								</MultiTrigger.Conditions>
+								<MultiTrigger.Setters>
+									<Setter Property="Background" Value="#1982C4"/>
+								</MultiTrigger.Setters>
+							</MultiTrigger>
+							<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+								<Setter Property="Foreground" Value="#818181" />
+							</DataTrigger>
+						</ControlTemplate.Triggers>
+					</ControlTemplate>
+				</Setter.Value>
+			</Setter>
+		</Style>
+	</Window.Resources>
+
+	<Window.Style>
+		<Style TargetType="{x:Type Window}">
+			<Setter Property="BorderBrush" Value="#1982C4" />
+			<Style.Triggers>
+				<Trigger Property="IsActive" Value="False">
+					<Setter Property="BorderBrush" Value="#3F3F46"/>
+				</Trigger>
+			</Style.Triggers>
+		</Style>
+	</Window.Style>
+
+	<Grid>
+		<Grid.Style>
+			<Style TargetType="{x:Type Grid}">
+				<Style.Triggers>
+					<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource AncestorType=Window}}" Value="Maximized">
+						<Setter Property="Margin" Value="6,6,6,8" />
+					</DataTrigger>
+				</Style.Triggers>
+			</Style>
+		</Grid.Style>
+
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto"/>
+			<RowDefinition/>
+			<RowDefinition Height="Auto"/>
+		</Grid.RowDefinitions>
+
+		<TextBlock Text="VS2013 DEMO" Margin="8,0" VerticalAlignment="Center" HorizontalAlignment="Left">
+			<TextBlock.Style>
+				<Style TargetType="{x:Type TextBlock}">
+					<Style.Triggers>
+						<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+							<Setter Property="Foreground" Value="#818181" />
+						</DataTrigger>
+					</Style.Triggers>
+				</Style>
+			</TextBlock.Style>
+		</TextBlock>
+
+		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" WindowChrome.IsHitTestVisibleInChrome="True">
+			<Button Style="{StaticResource MinimizeButton}" Click="MinimizeClick" />
+			<Button Style="{StaticResource MaximizeButton}" Click="MaximizeClick" />
+			<Button Style="{StaticResource RestoreDownButton}" Click="RestoreDownClick" />
+			<Button Style="{StaticResource CloseButton}" Click="CloseClick" />
+		</StackPanel>
+
+		<Border Grid.Row="2" Height="23" Background="#1982C4">
+			<Grid>
+				<TextBlock Text="Ready" VerticalAlignment="Center" Margin="6,0,0,0" />
+			</Grid>
+		</Border>
+	</Grid>
+</Window>
diff --git a/source/VS2013Test/MainView.xaml.cs b/source/VS2013Test/MainView.xaml.cs
new file mode 100644
index 00000000..79fbf41a
--- /dev/null
+++ b/source/VS2013Test/MainView.xaml.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace VS2013Test
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainView : Window
+    {
+        public MainView()
+        {
+            InitializeComponent();
+        }
+
+		private void MinimizeClick(object sender, RoutedEventArgs e)
+		{
+			WindowState = WindowState.Minimized;
+		}
+
+		private void MaximizeClick(object sender, RoutedEventArgs e)
+		{
+			WindowState = WindowState.Maximized;
+		}
+
+		private void RestoreDownClick(object sender, RoutedEventArgs e)
+		{
+			WindowState = WindowState.Normal;
+		}
+
+		private void CloseClick(object sender, RoutedEventArgs e)
+		{
+			Close();
+		}
+	}
+}
diff --git a/source/VS2013Test/MainViewModel.cs b/source/VS2013Test/MainViewModel.cs
new file mode 100644
index 00000000..d5aa7667
--- /dev/null
+++ b/source/VS2013Test/MainViewModel.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VS2013Test
+{
+	public class MainViewModel
+	{
+	}
+}
diff --git a/source/VS2013Test/VS2013Test.csproj b/source/VS2013Test/VS2013Test.csproj
new file mode 100644
index 00000000..f63849eb
--- /dev/null
+++ b/source/VS2013Test/VS2013Test.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Components\AvalonDock.Themes.VS2013\AvalonDock.Themes.VS2013.csproj" />
+  </ItemGroup>
+
+</Project>

From 3426f40018fd365c5edfc7517ba4450888e6ac79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=A2=D1=80=D1=83=D1=88=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2?= <oleg_trushkov@hotmail.com>
Date: Wed, 23 Jun 2021 00:40:11 +0300
Subject: [PATCH 2/8] Preparing demo project.

---
 source/VS2013Test/App.xaml                    |  21 +-
 source/VS2013Test/App.xaml.cs                 |  16 +-
 .../Converters/ActiveDocumentConverter.cs     |  26 ++
 source/VS2013Test/Icons/VisualStudioIcon.xaml |  17 ++
 .../VS2013Test/Icons/VisualStudioIcon.xaml.cs |  28 ++
 source/VS2013Test/LayoutInitializer.cs        |  97 +++++++
 source/VS2013Test/MainView.xaml               | 209 --------------
 source/VS2013Test/MainViewModel.cs            |  12 -
 source/VS2013Test/PanesStyleSelector.cs       |  32 +++
 source/VS2013Test/PanesTemplateSelector.cs    |  75 +++++
 source/VS2013Test/RelayCommand.cs             |  48 ++++
 source/VS2013Test/Themes/Generic.xaml         | 137 +++++++++
 .../VS2013Test/ViewModels/ErrorViewModel.cs   | 109 +++++++
 .../ViewModels/ExplorerViewModel.cs           | 109 +++++++
 .../ViewModels/FileStatsViewModel.cs          | 109 +++++++
 source/VS2013Test/ViewModels/FileViewModel.cs | 176 ++++++++++++
 .../VS2013Test/ViewModels/OutputViewModel.cs  | 109 +++++++
 source/VS2013Test/ViewModels/PaneViewModel.cs |  76 +++++
 .../ViewModels/PropertiesViewModel.cs         | 109 +++++++
 source/VS2013Test/ViewModels/ToolViewModel.cs |  38 +++
 source/VS2013Test/ViewModels/ViewModelBase.cs |  17 ++
 source/VS2013Test/ViewModels/Workspace.cs     | 267 ++++++++++++++++++
 source/VS2013Test/Views/MainView.xaml         | 206 ++++++++++++++
 .../VS2013Test/{ => Views}/MainView.xaml.cs   |   2 +-
 24 files changed, 1807 insertions(+), 238 deletions(-)
 create mode 100644 source/VS2013Test/Converters/ActiveDocumentConverter.cs
 create mode 100644 source/VS2013Test/Icons/VisualStudioIcon.xaml
 create mode 100644 source/VS2013Test/Icons/VisualStudioIcon.xaml.cs
 create mode 100644 source/VS2013Test/LayoutInitializer.cs
 delete mode 100644 source/VS2013Test/MainView.xaml
 delete mode 100644 source/VS2013Test/MainViewModel.cs
 create mode 100644 source/VS2013Test/PanesStyleSelector.cs
 create mode 100644 source/VS2013Test/PanesTemplateSelector.cs
 create mode 100644 source/VS2013Test/RelayCommand.cs
 create mode 100644 source/VS2013Test/Themes/Generic.xaml
 create mode 100644 source/VS2013Test/ViewModels/ErrorViewModel.cs
 create mode 100644 source/VS2013Test/ViewModels/ExplorerViewModel.cs
 create mode 100644 source/VS2013Test/ViewModels/FileStatsViewModel.cs
 create mode 100644 source/VS2013Test/ViewModels/FileViewModel.cs
 create mode 100644 source/VS2013Test/ViewModels/OutputViewModel.cs
 create mode 100644 source/VS2013Test/ViewModels/PaneViewModel.cs
 create mode 100644 source/VS2013Test/ViewModels/PropertiesViewModel.cs
 create mode 100644 source/VS2013Test/ViewModels/ToolViewModel.cs
 create mode 100644 source/VS2013Test/ViewModels/ViewModelBase.cs
 create mode 100644 source/VS2013Test/ViewModels/Workspace.cs
 create mode 100644 source/VS2013Test/Views/MainView.xaml
 rename source/VS2013Test/{ => Views}/MainView.xaml.cs (96%)

diff --git a/source/VS2013Test/App.xaml b/source/VS2013Test/App.xaml
index 53e54a34..1f155968 100644
--- a/source/VS2013Test/App.xaml
+++ b/source/VS2013Test/App.xaml
@@ -1,10 +1,21 @@
-<Application x:Class="VS2013Test.App"
+<Application x:Class="AvalonDock.VS2013Test.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:VS2013Test"
-             StartupUri="MainView.xaml">
+			 xmlns:converters="clr-namespace:AvalonDock.VS2013Test.Converters"    
+             StartupUri="Views/MainView.xaml">
 	
     <Application.Resources>
-         
-    </Application.Resources>
+		<ResourceDictionary>
+			<ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary>
+					<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+					<BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+					<converters:ActiveDocumentConverter x:Key="ActiveDocumentConverter" />
+				</ResourceDictionary>
+
+				<ResourceDictionary Source="pack://application:,,,/VS2013Test;component/Themes/Generic.xaml" />
+				<ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/DarkBrushs.xaml" />
+			</ResourceDictionary.MergedDictionaries>
+		</ResourceDictionary>
+	</Application.Resources>
 </Application>
diff --git a/source/VS2013Test/App.xaml.cs b/source/VS2013Test/App.xaml.cs
index 7a538cdc..8fa59c6b 100644
--- a/source/VS2013Test/App.xaml.cs
+++ b/source/VS2013Test/App.xaml.cs
@@ -1,17 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 
-namespace VS2013Test
+namespace AvalonDock.VS2013Test
 {
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
+	/// <summary>
+	/// Interaction logic for App.xaml
+	/// </summary>
+	public partial class App : Application
     {
     }
 }
diff --git a/source/VS2013Test/Converters/ActiveDocumentConverter.cs b/source/VS2013Test/Converters/ActiveDocumentConverter.cs
new file mode 100644
index 00000000..3131fe74
--- /dev/null
+++ b/source/VS2013Test/Converters/ActiveDocumentConverter.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Windows.Data;
+using AvalonDock.VS2013Test.ViewModels;
+
+namespace AvalonDock.VS2013Test.Converters
+{
+
+	public class ActiveDocumentConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			if (value is FileViewModel)
+				return value;
+
+			return Binding.DoNothing;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			if (value is FileViewModel)
+				return value;
+
+			return Binding.DoNothing;
+		}
+	}
+}
diff --git a/source/VS2013Test/Icons/VisualStudioIcon.xaml b/source/VS2013Test/Icons/VisualStudioIcon.xaml
new file mode 100644
index 00000000..f5383bf1
--- /dev/null
+++ b/source/VS2013Test/Icons/VisualStudioIcon.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="VS2013Test.Icons.VisualStudioIcon"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d">
+
+	<Path
+        Fill="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
+        Stretch="Uniform">
+		<Path.Data>
+			<GeometryGroup FillRule="EvenOdd">
+				<PathGeometry Figures="M68.89,95.6a6,6,0,0,0,3.93-.44L92.6,85.65A6,6,0,0,0,96,80.24V15.76a6,6,0,0,0-3.4-5.41L72.82.84A6,6,0,0,0,68.34.55,6,6,0,0,0,66,2L34.12,37.26,15.5,22l-1.63-1.4a4,4,0,0,0-3.61-.83,2.55,2.55,0,0,0-.53.18L2.46,23A4,4,0,0,0,0,26.37c0,.1,0,.2,0,.3V69.33c0,.1,0,.2,0,.3A4,4,0,0,0,2.46,73l7.27,3a2.55,2.55,0,0,0,.53.18,4,4,0,0,0,3.61-.83L15.5,74,34.12,58.74,66,94A6,6,0,0,0,68.89,95.6ZM72,27.68,47.21,48,72,68.32ZM12,34.27,24.41,48,12,61.73Z" />
+			</GeometryGroup>
+		</Path.Data>
+	</Path>
+</UserControl>
diff --git a/source/VS2013Test/Icons/VisualStudioIcon.xaml.cs b/source/VS2013Test/Icons/VisualStudioIcon.xaml.cs
new file mode 100644
index 00000000..9f2d2f07
--- /dev/null
+++ b/source/VS2013Test/Icons/VisualStudioIcon.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace VS2013Test.Icons
+{
+	/// <summary>
+	/// Interaction logic for VisualStudioIcon.xaml
+	/// </summary>
+	public partial class VisualStudioIcon : UserControl
+	{
+		public VisualStudioIcon()
+		{
+			InitializeComponent();
+		}
+	}
+}
diff --git a/source/VS2013Test/LayoutInitializer.cs b/source/VS2013Test/LayoutInitializer.cs
new file mode 100644
index 00000000..7a3e0957
--- /dev/null
+++ b/source/VS2013Test/LayoutInitializer.cs
@@ -0,0 +1,97 @@
+using System.Linq;
+using AvalonDock.Layout;
+using AvalonDock.VS2013Test.ViewModels;
+
+namespace AvalonDock.VS2013Test
+{
+	class LayoutInitializer : ILayoutUpdateStrategy
+	{
+		public bool BeforeInsertAnchorable(LayoutRoot layout, LayoutAnchorable anchorableToShow, ILayoutContainer destinationContainer)
+		{
+			//AD wants to add the anchorable into destinationContainer
+			//just for test provide a new anchorablepane 
+			//if the pane is floating let the manager go ahead
+			LayoutAnchorablePane destPane = destinationContainer as LayoutAnchorablePane;
+
+			if (destinationContainer != null && destinationContainer.FindParent<LayoutFloatingWindow>() != null)
+				return false;
+
+			if (anchorableToShow.Content is ExplorerViewModel)
+			{
+				anchorableToShow.AutoHideWidth = 256;
+
+				var treeViewPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "ExplorerPane");
+
+				if (treeViewPane != null)
+				{
+					treeViewPane.Children.Add(anchorableToShow);
+					return true;
+				}
+			}
+
+			if (anchorableToShow.Content is PropertiesViewModel)
+			{
+				var propertiesPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "PropertiesPane");
+				if (propertiesPane != null)
+				{
+					propertiesPane.Children.Add(anchorableToShow);
+					return true;
+				}
+			}
+
+			if (anchorableToShow.Content is FileStatsViewModel)
+			{
+				anchorableToShow.AutoHideWidth = 256;
+
+				var controllerPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "FileStatsPane");
+
+				if (controllerPane != null)
+				{
+					controllerPane.Children.Add(anchorableToShow);
+					return true;
+				}
+			}
+
+			if (anchorableToShow.Content is ErrorViewModel)
+			{
+				anchorableToShow.AutoHideHeight = 128;
+
+				var scriptEditorPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "ErrorPane");
+
+				if (scriptEditorPane != null)
+				{
+					scriptEditorPane.Children.Add(anchorableToShow);
+					return true;
+				}
+			}
+
+			if (anchorableToShow.Content is OutputViewModel)
+			{
+				anchorableToShow.AutoHideHeight = 128;
+
+				var outputPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "OutputPane");
+
+				if (outputPane != null)
+				{
+					outputPane.Children.Add(anchorableToShow);
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public void AfterInsertAnchorable(LayoutRoot layout, LayoutAnchorable anchorableShown)
+		{
+		}
+
+		public bool BeforeInsertDocument(LayoutRoot layout, LayoutDocument anchorableToShow, ILayoutContainer destinationContainer)
+		{
+			return false;
+		}
+
+		public void AfterInsertDocument(LayoutRoot layout, LayoutDocument anchorableShown)
+		{
+		}
+	}
+}
diff --git a/source/VS2013Test/MainView.xaml b/source/VS2013Test/MainView.xaml
deleted file mode 100644
index a58ece00..00000000
--- a/source/VS2013Test/MainView.xaml
+++ /dev/null
@@ -1,209 +0,0 @@
-<Window x:Class="VS2013Test.MainView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:VS2013Test"
-        mc:Ignorable="d"
-        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="450" Width="800" SnapsToDevicePixels="True" Foreground="White" Background="#2d2d30" BorderThickness="1" WindowStyle="None" ResizeMode="CanResize">
-
-	<Window.DataContext>
-		<local:MainViewModel/>
-	</Window.DataContext>
-
-	<WindowChrome.WindowChrome>
-		<WindowChrome CaptionHeight="33" ResizeBorderThickness="8" CornerRadius="0" GlassFrameThickness="0" NonClientFrameEdges="None" />
-	</WindowChrome.WindowChrome>
-
-	<Window.Resources>
-		<Style x:Key="CloseButton" TargetType="{x:Type Button}">
-			<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-			<Setter Property="IsTabStop" Value="False"/>
-			<Setter Property="Focusable" Value="False"/>
-			<Setter Property="ToolTip" Value="Close"/>
-			<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
-			<Setter Property="Foreground" Value="White"/>
-			<Setter Property="Template">
-				<Setter.Value>
-					<ControlTemplate TargetType="{x:Type Button}">
-						<Border Background="{TemplateBinding Background}">
-							<Path Width="46" Height="32" StrokeThickness="1" Stroke="{TemplateBinding Foreground}" Data="M 18,11 27,20 M 18,20 27,11"/>
-						</Border>
-
-						<ControlTemplate.Triggers>
-							<Trigger Property="IsMouseOver" Value="True">
-								<Setter Property="Background" Value="#393939"/>
-							</Trigger>
-							<Trigger Property="IsPressed" Value="true">
-								<Setter Property="Background" Value="#1982C4"/>
-							</Trigger>
-							<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-								<Setter Property="Foreground" Value="#818181" />
-							</DataTrigger>
-						</ControlTemplate.Triggers>
-					</ControlTemplate>
-				</Setter.Value>
-			</Setter>
-		</Style>
-
-		<Style x:Key="MaximizeButton" TargetType="{x:Type Button}">
-			<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-			<Setter Property="ToolTip" Value="Maximize"/>
-			<Setter Property="IsTabStop" Value="False"/>
-			<Setter Property="Focusable" Value="False"/>
-			<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
-			<Setter Property="Foreground" Value="White"/>
-			<Setter Property="Template">
-				<Setter.Value>
-					<ControlTemplate TargetType="{x:Type Button}">
-						<Border Background="{TemplateBinding Background}">
-							<Path x:Name="MaximizePath" Width="46" Height="32" Data="M 18.5,10.5 H 27.5 V 19.5 H 18.5 Z" Stroke="{TemplateBinding Foreground}" StrokeThickness="1" />
-						</Border>
-
-						<ControlTemplate.Triggers>
-							<Trigger Property="IsMouseOver" Value="True">
-								<Setter Property="Background" Value="#393939"/>
-							</Trigger>
-							<Trigger Property="IsPressed" Value="true">
-								<Setter Property="Background" Value="#1982C4"/>
-							</Trigger>
-							<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="Maximized">
-								<Setter Property="Visibility" Value="Collapsed"/>
-							</DataTrigger>
-							<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-								<Setter Property="Foreground" Value="#818181" />
-							</DataTrigger>
-						</ControlTemplate.Triggers>
-					</ControlTemplate>
-				</Setter.Value>
-			</Setter>
-		</Style>
-
-		<!--Прямоугольная кнопка нормального режима на панели состояния-->
-		<Style x:Key="RestoreDownButton" TargetType="{x:Type Button}">
-			<Setter Property="Visibility" Value="Collapsed"/>
-			<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-			<Setter Property="IsTabStop" Value="False"/>
-			<Setter Property="Focusable" Value="False"/>
-			<Setter Property="ToolTip" Value="Restore Down"/>
-			<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
-			<Setter Property="Foreground" Value="White"/>
-			<Setter Property="Template">
-				<Setter.Value>
-					<ControlTemplate TargetType="{x:Type Button}">
-						<Border Background="{TemplateBinding Background}">
-							<Path x:Name="RestoreDownPath" Width="46" Height="32" Data="M 18.5,12.5 H 25.5 V 19.5 H 18.5 Z M 20.5,12.5 V 10.5 H 27.5 V 17.5 H 25.5" Stroke="{TemplateBinding Foreground}" StrokeThickness="1" />
-						</Border>
-
-						<ControlTemplate.Triggers>
-							<Trigger Property="IsMouseOver" Value="True">
-								<Setter Property="Background" Value="#393939"/>
-							</Trigger>
-							<Trigger Property="IsPressed" Value="true">
-								<Setter Property="Background" Value="#1982C4"/>
-							</Trigger>
-							<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="Maximized">
-								<Setter Property="Visibility" Value="Visible"/>
-							</DataTrigger>
-							<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-								<Setter Property="Foreground" Value="#818181" />
-							</DataTrigger>
-						</ControlTemplate.Triggers>
-					</ControlTemplate>
-				</Setter.Value>
-			</Setter>
-		</Style>
-
-		<!--Прямоугольная кнопка сворачивания на панели состояния-->
-		<Style x:Key="MinimizeButton" TargetType="{x:Type Button}">
-			<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-			<Setter Property="RenderOptions.EdgeMode" Value="Aliased"/>
-			<Setter Property="IsTabStop" Value="False"/>
-			<Setter Property="Focusable" Value="False"/>
-			<Setter Property="ToolTip" Value="Minimize"/>
-			<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
-			<Setter Property="Foreground" Value="White"/>
-			<Setter Property="Template">
-				<Setter.Value>
-					<ControlTemplate TargetType="{x:Type Button}">
-						<Border Background="{TemplateBinding Background}">
-							<Path Width="46" Height="32" StrokeThickness="1" Stroke="{TemplateBinding Foreground}" Data="M 18,15 H 28"/>
-						</Border>
-
-						<ControlTemplate.Triggers>
-							<Trigger Property="IsMouseOver" Value="True">
-								<Setter Property="Background" Value="#393939"/>
-							</Trigger>
-							<MultiTrigger>
-								<MultiTrigger.Conditions>
-									<Condition Property="IsMouseOver" Value="True" />
-									<Condition Property="IsPressed" Value="True" />
-								</MultiTrigger.Conditions>
-								<MultiTrigger.Setters>
-									<Setter Property="Background" Value="#1982C4"/>
-								</MultiTrigger.Setters>
-							</MultiTrigger>
-							<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-								<Setter Property="Foreground" Value="#818181" />
-							</DataTrigger>
-						</ControlTemplate.Triggers>
-					</ControlTemplate>
-				</Setter.Value>
-			</Setter>
-		</Style>
-	</Window.Resources>
-
-	<Window.Style>
-		<Style TargetType="{x:Type Window}">
-			<Setter Property="BorderBrush" Value="#1982C4" />
-			<Style.Triggers>
-				<Trigger Property="IsActive" Value="False">
-					<Setter Property="BorderBrush" Value="#3F3F46"/>
-				</Trigger>
-			</Style.Triggers>
-		</Style>
-	</Window.Style>
-
-	<Grid>
-		<Grid.Style>
-			<Style TargetType="{x:Type Grid}">
-				<Style.Triggers>
-					<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource AncestorType=Window}}" Value="Maximized">
-						<Setter Property="Margin" Value="6,6,6,8" />
-					</DataTrigger>
-				</Style.Triggers>
-			</Style>
-		</Grid.Style>
-
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto"/>
-			<RowDefinition/>
-			<RowDefinition Height="Auto"/>
-		</Grid.RowDefinitions>
-
-		<TextBlock Text="VS2013 DEMO" Margin="8,0" VerticalAlignment="Center" HorizontalAlignment="Left">
-			<TextBlock.Style>
-				<Style TargetType="{x:Type TextBlock}">
-					<Style.Triggers>
-						<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-							<Setter Property="Foreground" Value="#818181" />
-						</DataTrigger>
-					</Style.Triggers>
-				</Style>
-			</TextBlock.Style>
-		</TextBlock>
-
-		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" WindowChrome.IsHitTestVisibleInChrome="True">
-			<Button Style="{StaticResource MinimizeButton}" Click="MinimizeClick" />
-			<Button Style="{StaticResource MaximizeButton}" Click="MaximizeClick" />
-			<Button Style="{StaticResource RestoreDownButton}" Click="RestoreDownClick" />
-			<Button Style="{StaticResource CloseButton}" Click="CloseClick" />
-		</StackPanel>
-
-		<Border Grid.Row="2" Height="23" Background="#1982C4">
-			<Grid>
-				<TextBlock Text="Ready" VerticalAlignment="Center" Margin="6,0,0,0" />
-			</Grid>
-		</Border>
-	</Grid>
-</Window>
diff --git a/source/VS2013Test/MainViewModel.cs b/source/VS2013Test/MainViewModel.cs
deleted file mode 100644
index d5aa7667..00000000
--- a/source/VS2013Test/MainViewModel.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VS2013Test
-{
-	public class MainViewModel
-	{
-	}
-}
diff --git a/source/VS2013Test/PanesStyleSelector.cs b/source/VS2013Test/PanesStyleSelector.cs
new file mode 100644
index 00000000..c379f6ae
--- /dev/null
+++ b/source/VS2013Test/PanesStyleSelector.cs
@@ -0,0 +1,32 @@
+using System.Windows.Controls;
+using System.Windows;
+using AvalonDock.VS2013Test.ViewModels;
+
+namespace AvalonDock.VS2013Test
+{
+	class PanesStyleSelector : StyleSelector
+	{
+		public Style ToolStyle
+		{
+			get;
+			set;
+		}
+
+		public Style FileStyle
+		{
+			get;
+			set;
+		}
+
+		public override Style SelectStyle(object item, DependencyObject container)
+		{
+			if (item is ToolViewModel)
+				return ToolStyle;
+
+			if (item is FileViewModel)
+				return FileStyle;
+
+			return base.SelectStyle(item, container);
+		}
+	}
+}
diff --git a/source/VS2013Test/PanesTemplateSelector.cs b/source/VS2013Test/PanesTemplateSelector.cs
new file mode 100644
index 00000000..6caae624
--- /dev/null
+++ b/source/VS2013Test/PanesTemplateSelector.cs
@@ -0,0 +1,75 @@
+using System.Windows.Controls;
+using System.Windows;
+using AvalonDock.Layout;
+using AvalonDock.VS2013Test.ViewModels;
+
+namespace AvalonDock.VS2013Test
+{
+	class PanesTemplateSelector : DataTemplateSelector
+	{
+		public PanesTemplateSelector()
+		{
+		}
+
+		public DataTemplate FileViewTemplate
+		{
+			get;
+			set;
+		}
+
+		public DataTemplate FileStatsViewTemplate
+		{
+			get;
+			set;
+		}
+
+		public DataTemplate PropertiesViewTemplate
+		{
+			get;
+			set;
+		}
+
+		public DataTemplate ExplorerViewTemplate
+		{
+			get;
+			set;
+		}
+
+		public DataTemplate ErrorViewTemplate
+		{
+			get;
+			set;
+		}
+
+		public DataTemplate OutputViewTemplate
+		{
+			get;
+			set;
+		}
+
+		public override DataTemplate SelectTemplate(object item, DependencyObject container)
+		{
+			var itemAsLayoutContent = item as LayoutContent;
+
+			if (item is FileViewModel)
+				return FileViewTemplate;
+
+			if (item is FileStatsViewModel)
+				return FileStatsViewTemplate;
+
+			if (item is PropertiesViewModel)
+				return PropertiesViewTemplate;
+
+			if (item is ExplorerViewModel)
+				return ExplorerViewTemplate;
+
+			if (item is ErrorViewModel)
+				return ErrorViewTemplate;
+
+			if (item is OutputViewModel)
+				return OutputViewTemplate;
+
+			return base.SelectTemplate(item, container);
+		}
+	}
+}
diff --git a/source/VS2013Test/RelayCommand.cs b/source/VS2013Test/RelayCommand.cs
new file mode 100644
index 00000000..2807f5d0
--- /dev/null
+++ b/source/VS2013Test/RelayCommand.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Windows.Input;
+
+namespace AvalonDock.VS2013Test
+{
+	internal class RelayCommand : ICommand
+	{
+		#region fields
+
+		readonly Action<object> _execute;
+		readonly Predicate<object> _canExecute;
+
+		#endregion fields
+
+		#region Constructors
+
+		public RelayCommand(Action<object> execute) : this(execute, null)
+		{
+		}
+
+		public RelayCommand(Action<object> execute, Predicate<object> canExecute)
+		{
+			_execute = execute ?? throw new ArgumentNullException(nameof(execute));
+			_canExecute = canExecute;
+		}
+		#endregion Constructors
+
+		#region ICommand Members
+
+		public bool CanExecute(object parameter)
+		{
+			return _canExecute?.Invoke(parameter) ?? true;
+		}
+
+		public event EventHandler CanExecuteChanged
+		{
+			add { CommandManager.RequerySuggested += value; }
+			remove { CommandManager.RequerySuggested -= value; }
+		}
+
+		public void Execute(object parameter)
+		{
+			_execute(parameter);
+		}
+
+		#endregion ICommand Members
+	}
+}
diff --git a/source/VS2013Test/Themes/Generic.xaml b/source/VS2013Test/Themes/Generic.xaml
new file mode 100644
index 00000000..0eea1147
--- /dev/null
+++ b/source/VS2013Test/Themes/Generic.xaml
@@ -0,0 +1,137 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<Style x:Key="CloseButton" TargetType="{x:Type Button}">
+		<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+		<Setter Property="IsTabStop" Value="False"/>
+		<Setter Property="Focusable" Value="False"/>
+		<Setter Property="ToolTip" Value="Close"/>
+		<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
+		<Setter Property="Foreground" Value="White"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Button}">
+					<Border Background="{TemplateBinding Background}">
+						<Path Width="46" Height="32" StrokeThickness="1" Stroke="{TemplateBinding Foreground}" Data="M 18,11 27,20 M 18,20 27,11"/>
+					</Border>
+
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Background" Value="#393939"/>
+						</Trigger>
+						<Trigger Property="IsPressed" Value="true">
+							<Setter Property="Background" Value="#1982C4"/>
+						</Trigger>
+						<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+							<Setter Property="Foreground" Value="#818181" />
+						</DataTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style x:Key="MaximizeButton" TargetType="{x:Type Button}">
+		<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+		<Setter Property="ToolTip" Value="Maximize"/>
+		<Setter Property="IsTabStop" Value="False"/>
+		<Setter Property="Focusable" Value="False"/>
+		<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
+		<Setter Property="Foreground" Value="White"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Button}">
+					<Border Background="{TemplateBinding Background}">
+						<Path x:Name="MaximizePath" Width="46" Height="32" Data="M 18.5,10.5 H 27.5 V 19.5 H 18.5 Z" Stroke="{TemplateBinding Foreground}" StrokeThickness="1" />
+					</Border>
+
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Background" Value="#393939"/>
+						</Trigger>
+						<Trigger Property="IsPressed" Value="true">
+							<Setter Property="Background" Value="#1982C4"/>
+						</Trigger>
+						<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="Maximized">
+							<Setter Property="Visibility" Value="Collapsed"/>
+						</DataTrigger>
+						<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+							<Setter Property="Foreground" Value="#818181" />
+						</DataTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style x:Key="RestoreDownButton" TargetType="{x:Type Button}">
+		<Setter Property="Visibility" Value="Collapsed"/>
+		<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+		<Setter Property="IsTabStop" Value="False"/>
+		<Setter Property="Focusable" Value="False"/>
+		<Setter Property="ToolTip" Value="Restore Down"/>
+		<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
+		<Setter Property="Foreground" Value="White"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Button}">
+					<Border Background="{TemplateBinding Background}">
+						<Path x:Name="RestoreDownPath" Width="46" Height="32" Data="M 18.5,12.5 H 25.5 V 19.5 H 18.5 Z M 20.5,12.5 V 10.5 H 27.5 V 17.5 H 25.5" Stroke="{TemplateBinding Foreground}" StrokeThickness="1" />
+					</Border>
+
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Background" Value="#393939"/>
+						</Trigger>
+						<Trigger Property="IsPressed" Value="true">
+							<Setter Property="Background" Value="#1982C4"/>
+						</Trigger>
+						<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="Maximized">
+							<Setter Property="Visibility" Value="Visible"/>
+						</DataTrigger>
+						<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+							<Setter Property="Foreground" Value="#818181" />
+						</DataTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style x:Key="MinimizeButton" TargetType="{x:Type Button}">
+		<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+		<Setter Property="RenderOptions.EdgeMode" Value="Aliased"/>
+		<Setter Property="IsTabStop" Value="False"/>
+		<Setter Property="Focusable" Value="False"/>
+		<Setter Property="ToolTip" Value="Minimize"/>
+		<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
+		<Setter Property="Foreground" Value="White"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Button}">
+					<Border Background="{TemplateBinding Background}">
+						<Path Width="46" Height="32" StrokeThickness="1" Stroke="{TemplateBinding Foreground}" Data="M 18,15 H 28"/>
+					</Border>
+
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Background" Value="#393939"/>
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsMouseOver" Value="True" />
+								<Condition Property="IsPressed" Value="True" />
+							</MultiTrigger.Conditions>
+							<MultiTrigger.Setters>
+								<Setter Property="Background" Value="#1982C4"/>
+							</MultiTrigger.Setters>
+						</MultiTrigger>
+						<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+							<Setter Property="Foreground" Value="#818181" />
+						</DataTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/ViewModels/ErrorViewModel.cs b/source/VS2013Test/ViewModels/ErrorViewModel.cs
new file mode 100644
index 00000000..af59325b
--- /dev/null
+++ b/source/VS2013Test/ViewModels/ErrorViewModel.cs
@@ -0,0 +1,109 @@
+using System;
+using System.IO;
+using System.Windows.Media.Imaging;
+
+namespace AvalonDock.VS2013Test.ViewModels
+{
+	internal class ErrorViewModel : ToolViewModel
+	{
+		#region fields
+		public const string ToolContentId = "FileStatsTool";
+		private DateTime _lastModified;
+		private long _fileSize;
+		private string _FileName;
+		private string _FilePath;
+		#endregion fields
+
+		#region constructors
+		/// <summary>
+		/// Class constructor
+		/// </summary>
+		public ErrorViewModel()
+			: base("Error List")
+		{
+			Workspace.This.ActiveDocumentChanged += new EventHandler(OnActiveDocumentChanged);
+			ContentId = ToolContentId;
+		}
+		#endregion constructors
+
+		#region Properties
+
+		public long FileSize
+		{
+			get => _fileSize;
+			protected set
+			{
+				if (_fileSize != value)
+				{
+					_fileSize = value;
+					RaisePropertyChanged(nameof(FileSize));
+				}
+			}
+		}
+
+		public DateTime LastModified
+		{
+			get => _lastModified;
+			protected set
+			{
+				if (_lastModified != value)
+				{
+					_lastModified = value;
+					RaisePropertyChanged(nameof(LastModified));
+				}
+			}
+		}
+
+		public string FileName
+		{
+			get => _FileName;
+			protected set
+			{
+				if (_FileName != value)
+				{
+					_FileName = value;
+					RaisePropertyChanged(nameof(FileName));
+				}
+			}
+		}
+
+		public string FilePath
+		{
+			get => _FilePath;
+			protected set
+			{
+				if (_FilePath != value)
+				{
+					_FilePath = value;
+					RaisePropertyChanged(nameof(FilePath));
+				}
+			}
+		}
+
+		#endregion Properties
+
+		#region methods
+		private void OnActiveDocumentChanged(object sender, EventArgs e)
+		{
+			if (Workspace.This.ActiveDocument != null &&
+				Workspace.This.ActiveDocument.FilePath != null &&
+				File.Exists(Workspace.This.ActiveDocument.FilePath))
+			{
+				var fi = new FileInfo(Workspace.This.ActiveDocument.FilePath);
+				FileSize = fi.Length;
+				LastModified = fi.LastWriteTime;
+				FileName = fi.Name;
+				FilePath = fi.Directory.FullName;
+			}
+			else
+			{
+				FileSize = 0;
+				LastModified = DateTime.MinValue;
+				FileName = string.Empty;
+				FilePath = string.Empty;
+			}
+		}
+		#endregion methods
+
+	}
+}
diff --git a/source/VS2013Test/ViewModels/ExplorerViewModel.cs b/source/VS2013Test/ViewModels/ExplorerViewModel.cs
new file mode 100644
index 00000000..4c4fe65d
--- /dev/null
+++ b/source/VS2013Test/ViewModels/ExplorerViewModel.cs
@@ -0,0 +1,109 @@
+using System;
+using System.IO;
+using System.Windows.Media.Imaging;
+
+namespace AvalonDock.VS2013Test.ViewModels
+{
+	internal class ExplorerViewModel : ToolViewModel
+	{
+		#region fields
+		public const string ToolContentId = "FileStatsTool";
+		private DateTime _lastModified;
+		private long _fileSize;
+		private string _FileName;
+		private string _FilePath;
+		#endregion fields
+
+		#region constructors
+		/// <summary>
+		/// Class constructor
+		/// </summary>
+		public ExplorerViewModel()
+			: base("Solution Explorer")
+		{
+			Workspace.This.ActiveDocumentChanged += new EventHandler(OnActiveDocumentChanged);
+			ContentId = ToolContentId;
+		}
+		#endregion constructors
+
+		#region Properties
+
+		public long FileSize
+		{
+			get => _fileSize;
+			protected set
+			{
+				if (_fileSize != value)
+				{
+					_fileSize = value;
+					RaisePropertyChanged(nameof(FileSize));
+				}
+			}
+		}
+
+		public DateTime LastModified
+		{
+			get => _lastModified;
+			protected set
+			{
+				if (_lastModified != value)
+				{
+					_lastModified = value;
+					RaisePropertyChanged(nameof(LastModified));
+				}
+			}
+		}
+
+		public string FileName
+		{
+			get => _FileName;
+			protected set
+			{
+				if (_FileName != value)
+				{
+					_FileName = value;
+					RaisePropertyChanged(nameof(FileName));
+				}
+			}
+		}
+
+		public string FilePath
+		{
+			get => _FilePath;
+			protected set
+			{
+				if (_FilePath != value)
+				{
+					_FilePath = value;
+					RaisePropertyChanged(nameof(FilePath));
+				}
+			}
+		}
+
+		#endregion Properties
+
+		#region methods
+		private void OnActiveDocumentChanged(object sender, EventArgs e)
+		{
+			if (Workspace.This.ActiveDocument != null &&
+				Workspace.This.ActiveDocument.FilePath != null &&
+				File.Exists(Workspace.This.ActiveDocument.FilePath))
+			{
+				var fi = new FileInfo(Workspace.This.ActiveDocument.FilePath);
+				FileSize = fi.Length;
+				LastModified = fi.LastWriteTime;
+				FileName = fi.Name;
+				FilePath = fi.Directory.FullName;
+			}
+			else
+			{
+				FileSize = 0;
+				LastModified = DateTime.MinValue;
+				FileName = string.Empty;
+				FilePath = string.Empty;
+			}
+		}
+		#endregion methods
+
+	}
+}
diff --git a/source/VS2013Test/ViewModels/FileStatsViewModel.cs b/source/VS2013Test/ViewModels/FileStatsViewModel.cs
new file mode 100644
index 00000000..938aa7d0
--- /dev/null
+++ b/source/VS2013Test/ViewModels/FileStatsViewModel.cs
@@ -0,0 +1,109 @@
+using System;
+using System.IO;
+using System.Windows.Media.Imaging;
+
+namespace AvalonDock.VS2013Test.ViewModels
+{
+	internal class FileStatsViewModel : ToolViewModel
+	{
+		#region fields
+		public const string ToolContentId = "FileStatsTool";
+		private DateTime _lastModified;
+		private long _fileSize;
+		private string _FileName;
+		private string _FilePath;
+		#endregion fields
+
+		#region constructors
+		/// <summary>
+		/// Class constructor
+		/// </summary>
+		public FileStatsViewModel()
+			: base("File Stats")
+		{
+			Workspace.This.ActiveDocumentChanged += new EventHandler(OnActiveDocumentChanged);
+			ContentId = ToolContentId;
+		}
+		#endregion constructors
+
+		#region Properties
+
+		public long FileSize
+		{
+			get => _fileSize;
+			protected set
+			{
+				if (_fileSize != value)
+				{
+					_fileSize = value;
+					RaisePropertyChanged(nameof(FileSize));
+				}
+			}
+		}
+
+		public DateTime LastModified
+		{
+			get => _lastModified;
+			protected set
+			{
+				if (_lastModified != value)
+				{
+					_lastModified = value;
+					RaisePropertyChanged(nameof(LastModified));
+				}
+			}
+		}
+
+		public string FileName
+		{
+			get => _FileName;
+			protected set
+			{
+				if (_FileName != value)
+				{
+					_FileName = value;
+					RaisePropertyChanged(nameof(FileName));
+				}
+			}
+		}
+
+		public string FilePath
+		{
+			get => _FilePath;
+			protected set
+			{
+				if (_FilePath != value)
+				{
+					_FilePath = value;
+					RaisePropertyChanged(nameof(FilePath));
+				}
+			}
+		}
+
+		#endregion Properties
+
+		#region methods
+		private void OnActiveDocumentChanged(object sender, EventArgs e)
+		{
+			if (Workspace.This.ActiveDocument != null &&
+				Workspace.This.ActiveDocument.FilePath != null &&
+				File.Exists(Workspace.This.ActiveDocument.FilePath))
+			{
+				var fi = new FileInfo(Workspace.This.ActiveDocument.FilePath);
+				FileSize = fi.Length;
+				LastModified = fi.LastWriteTime;
+				FileName = fi.Name;
+				FilePath = fi.Directory.FullName;
+			}
+			else
+			{
+				FileSize = 0;
+				LastModified = DateTime.MinValue;
+				FileName = string.Empty;
+				FilePath = string.Empty;
+			}
+		}
+		#endregion methods
+
+	}
+}
diff --git a/source/VS2013Test/ViewModels/FileViewModel.cs b/source/VS2013Test/ViewModels/FileViewModel.cs
new file mode 100644
index 00000000..884c5281
--- /dev/null
+++ b/source/VS2013Test/ViewModels/FileViewModel.cs
@@ -0,0 +1,176 @@
+using System.IO;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace AvalonDock.VS2013Test.ViewModels
+{
+	class FileViewModel : PaneViewModel
+	{
+		#region fields
+		private static ImageSourceConverter ISC = new ImageSourceConverter();
+		private string _filePath = null;
+		private string _textContent = string.Empty;
+		private bool _isDirty = false;
+		private RelayCommand _saveCommand = null;
+		private RelayCommand _saveAsCommand = null;
+		private RelayCommand _closeCommand = null;
+		#endregion fields
+
+		#region constructors
+		/// <summary>
+		/// Class constructor from file path.
+		/// </summary>
+		/// <param name="filePath"></param>
+		public FileViewModel(string filePath)
+		{
+			FilePath = filePath;
+			Title = FileName;
+
+			//Set the icon only for open documents (just a test)
+			IconSource = ISC.ConvertFromInvariantString(@"pack://application:,,/Images/document.png") as ImageSource;
+		}
+
+		/// <summary>
+		/// Default class constructor
+		/// </summary>
+		public FileViewModel()
+		{
+			IsDirty = true;
+			Title = FileName;
+		}
+		#endregion constructors
+
+		#region Properties
+		public string FilePath
+		{
+			get => _filePath;
+			set
+			{
+				if (_filePath != value)
+				{
+					_filePath = value;
+					RaisePropertyChanged(nameof(FilePath));
+					RaisePropertyChanged(nameof(FileName));
+					RaisePropertyChanged(nameof(Title));
+
+					if (File.Exists(_filePath))
+					{
+						_textContent = File.ReadAllText(_filePath);
+						ContentId = _filePath;
+					}
+				}
+			}
+		}
+
+		public string FileName
+		{
+			get
+			{
+				if (FilePath == null)
+					return "Noname" + (IsDirty ? "*" : "");
+
+				return System.IO.Path.GetFileName(FilePath) + (IsDirty ? "*" : "");
+			}
+		}
+
+		public string TextContent
+		{
+			get => _textContent;
+			set
+			{
+				if (_textContent != value)
+				{
+					_textContent = value;
+					RaisePropertyChanged(nameof(TextContent));
+					IsDirty = true;
+				}
+			}
+		}
+
+		public bool IsDirty
+		{
+			get => _isDirty;
+			set
+			{
+				if (_isDirty != value)
+				{
+					_isDirty = value;
+					RaisePropertyChanged(nameof(IsDirty));
+					RaisePropertyChanged(nameof(FileName));
+				}
+			}
+		}
+
+		public ICommand SaveCommand
+		{
+			get
+			{
+				if (_saveCommand == null)
+				{
+					_saveCommand = new RelayCommand((p) => OnSave(p), (p) => CanSave(p));
+				}
+
+				return _saveCommand;
+			}
+		}
+
+		public ICommand SaveAsCommand
+		{
+			get
+			{
+				if (_saveAsCommand == null)
+				{
+					_saveAsCommand = new RelayCommand((p) => OnSaveAs(p), (p) => CanSaveAs(p));
+				}
+
+				return _saveAsCommand;
+			}
+		}
+
+		public ICommand CloseCommand
+		{
+			get
+			{
+				if (_closeCommand == null)
+				{
+					_closeCommand = new RelayCommand((p) => OnClose(), (p) => CanClose());
+				}
+
+				return _closeCommand;
+			}
+		}
+		#endregion  Properties
+
+		#region methods
+		private bool CanClose()
+		{
+			return true;
+		}
+
+		private void OnClose()
+		{
+			Workspace.This.Close(this);
+		}
+
+		private bool CanSave(object parameter)
+		{
+			return IsDirty;
+		}
+
+		private void OnSave(object parameter)
+		{
+			Workspace.This.Save(this, false);
+		}
+
+		private bool CanSaveAs(object parameter)
+		{
+			return IsDirty;
+		}
+
+		private void OnSaveAs(object parameter)
+		{
+			Workspace.This.Save(this, true);
+		}
+		#endregion methods
+	}
+}
diff --git a/source/VS2013Test/ViewModels/OutputViewModel.cs b/source/VS2013Test/ViewModels/OutputViewModel.cs
new file mode 100644
index 00000000..2d6ad9c4
--- /dev/null
+++ b/source/VS2013Test/ViewModels/OutputViewModel.cs
@@ -0,0 +1,109 @@
+using System;
+using System.IO;
+using System.Windows.Media.Imaging;
+
+namespace AvalonDock.VS2013Test.ViewModels
+{
+	internal class OutputViewModel : ToolViewModel
+	{
+		#region fields
+		public const string ToolContentId = "FileStatsTool";
+		private DateTime _lastModified;
+		private long _fileSize;
+		private string _FileName;
+		private string _FilePath;
+		#endregion fields
+
+		#region constructors
+		/// <summary>
+		/// Class constructor
+		/// </summary>
+		public OutputViewModel()
+			: base("Output")
+		{
+			Workspace.This.ActiveDocumentChanged += new EventHandler(OnActiveDocumentChanged);
+			ContentId = ToolContentId;
+		}
+		#endregion constructors
+
+		#region Properties
+
+		public long FileSize
+		{
+			get => _fileSize;
+			protected set
+			{
+				if (_fileSize != value)
+				{
+					_fileSize = value;
+					RaisePropertyChanged(nameof(FileSize));
+				}
+			}
+		}
+
+		public DateTime LastModified
+		{
+			get => _lastModified;
+			protected set
+			{
+				if (_lastModified != value)
+				{
+					_lastModified = value;
+					RaisePropertyChanged(nameof(LastModified));
+				}
+			}
+		}
+
+		public string FileName
+		{
+			get => _FileName;
+			protected set
+			{
+				if (_FileName != value)
+				{
+					_FileName = value;
+					RaisePropertyChanged(nameof(FileName));
+				}
+			}
+		}
+
+		public string FilePath
+		{
+			get => _FilePath;
+			protected set
+			{
+				if (_FilePath != value)
+				{
+					_FilePath = value;
+					RaisePropertyChanged(nameof(FilePath));
+				}
+			}
+		}
+
+		#endregion Properties
+
+		#region methods
+		private void OnActiveDocumentChanged(object sender, EventArgs e)
+		{
+			if (Workspace.This.ActiveDocument != null &&
+				Workspace.This.ActiveDocument.FilePath != null &&
+				File.Exists(Workspace.This.ActiveDocument.FilePath))
+			{
+				var fi = new FileInfo(Workspace.This.ActiveDocument.FilePath);
+				FileSize = fi.Length;
+				LastModified = fi.LastWriteTime;
+				FileName = fi.Name;
+				FilePath = fi.Directory.FullName;
+			}
+			else
+			{
+				FileSize = 0;
+				LastModified = DateTime.MinValue;
+				FileName = string.Empty;
+				FilePath = string.Empty;
+			}
+		}
+		#endregion methods
+
+	}
+}
diff --git a/source/VS2013Test/ViewModels/PaneViewModel.cs b/source/VS2013Test/ViewModels/PaneViewModel.cs
new file mode 100644
index 00000000..00ff9cc8
--- /dev/null
+++ b/source/VS2013Test/ViewModels/PaneViewModel.cs
@@ -0,0 +1,76 @@
+using System.Windows.Media;
+
+namespace AvalonDock.VS2013Test.ViewModels
+{
+	class PaneViewModel : ViewModelBase
+	{
+		#region fields
+		private string _title = null;
+		private string _contentId = null;
+		private bool _isSelected = false;
+		private bool _isActive = false;
+		#endregion fields
+
+		#region constructors
+		public PaneViewModel()
+		{
+		}
+		#endregion constructors
+
+		#region Properties
+		public string Title
+		{
+			get => _title;
+			set
+			{
+				if (_title != value)
+				{
+					_title = value;
+					RaisePropertyChanged(nameof(Title));
+				}
+			}
+		}
+
+		public ImageSource IconSource { get; protected set; }
+
+		public string ContentId
+		{
+			get => _contentId;
+			set
+			{
+				if (_contentId != value)
+				{
+					_contentId = value;
+					RaisePropertyChanged(nameof(ContentId));
+				}
+			}
+		}
+
+		public bool IsSelected
+		{
+			get => _isSelected;
+			set
+			{
+				if (_isSelected != value)
+				{
+					_isSelected = value;
+					RaisePropertyChanged(nameof(IsSelected));
+				}
+			}
+		}
+
+		public bool IsActive
+		{
+			get => _isActive;
+			set
+			{
+				if (_isActive != value)
+				{
+					_isActive = value;
+					RaisePropertyChanged(nameof(IsActive));
+				}
+			}
+		}
+		#endregion Properties
+	}
+}
diff --git a/source/VS2013Test/ViewModels/PropertiesViewModel.cs b/source/VS2013Test/ViewModels/PropertiesViewModel.cs
new file mode 100644
index 00000000..78826713
--- /dev/null
+++ b/source/VS2013Test/ViewModels/PropertiesViewModel.cs
@@ -0,0 +1,109 @@
+using System;
+using System.IO;
+using System.Windows.Media.Imaging;
+
+namespace AvalonDock.VS2013Test.ViewModels
+{
+	internal class PropertiesViewModel : ToolViewModel
+	{
+		#region fields
+		public const string ToolContentId = "FileStatsTool";
+		private DateTime _lastModified;
+		private long _fileSize;
+		private string _FileName;
+		private string _FilePath;
+		#endregion fields
+
+		#region constructors
+		/// <summary>
+		/// Class constructor
+		/// </summary>
+		public PropertiesViewModel()
+			: base("Properties")
+		{
+			Workspace.This.ActiveDocumentChanged += new EventHandler(OnActiveDocumentChanged);
+			ContentId = ToolContentId;
+		}
+		#endregion constructors
+
+		#region Properties
+
+		public long FileSize
+		{
+			get => _fileSize;
+			protected set
+			{
+				if (_fileSize != value)
+				{
+					_fileSize = value;
+					RaisePropertyChanged(nameof(FileSize));
+				}
+			}
+		}
+
+		public DateTime LastModified
+		{
+			get => _lastModified;
+			protected set
+			{
+				if (_lastModified != value)
+				{
+					_lastModified = value;
+					RaisePropertyChanged(nameof(LastModified));
+				}
+			}
+		}
+
+		public string FileName
+		{
+			get => _FileName;
+			protected set
+			{
+				if (_FileName != value)
+				{
+					_FileName = value;
+					RaisePropertyChanged(nameof(FileName));
+				}
+			}
+		}
+
+		public string FilePath
+		{
+			get => _FilePath;
+			protected set
+			{
+				if (_FilePath != value)
+				{
+					_FilePath = value;
+					RaisePropertyChanged(nameof(FilePath));
+				}
+			}
+		}
+
+		#endregion Properties
+
+		#region methods
+		private void OnActiveDocumentChanged(object sender, EventArgs e)
+		{
+			if (Workspace.This.ActiveDocument != null &&
+				Workspace.This.ActiveDocument.FilePath != null &&
+				File.Exists(Workspace.This.ActiveDocument.FilePath))
+			{
+				var fi = new FileInfo(Workspace.This.ActiveDocument.FilePath);
+				FileSize = fi.Length;
+				LastModified = fi.LastWriteTime;
+				FileName = fi.Name;
+				FilePath = fi.Directory.FullName;
+			}
+			else
+			{
+				FileSize = 0;
+				LastModified = DateTime.MinValue;
+				FileName = string.Empty;
+				FilePath = string.Empty;
+			}
+		}
+		#endregion methods
+
+	}
+}
diff --git a/source/VS2013Test/ViewModels/ToolViewModel.cs b/source/VS2013Test/ViewModels/ToolViewModel.cs
new file mode 100644
index 00000000..049818f1
--- /dev/null
+++ b/source/VS2013Test/ViewModels/ToolViewModel.cs
@@ -0,0 +1,38 @@
+namespace AvalonDock.VS2013Test.ViewModels
+{
+	internal class ToolViewModel : PaneViewModel
+	{
+		#region fields
+		private bool _isVisible = true;
+		#endregion fields
+
+		#region constructor
+		/// <summary>
+		/// Class constructor
+		/// </summary>
+		/// <param name="name"></param>
+		public ToolViewModel(string name)
+		{
+			Name = name;
+			Title = name;
+		}
+		#endregion constructor
+
+		#region Properties
+		public string Name { get; private set; }
+
+		public bool IsVisible
+		{
+			get => _isVisible;
+			set
+			{
+				if (_isVisible != value)
+				{
+					_isVisible = value;
+					RaisePropertyChanged(nameof(IsVisible));
+				}
+			}
+		}
+		#endregion Properties
+	}
+}
diff --git a/source/VS2013Test/ViewModels/ViewModelBase.cs b/source/VS2013Test/ViewModels/ViewModelBase.cs
new file mode 100644
index 00000000..23e1d88f
--- /dev/null
+++ b/source/VS2013Test/ViewModels/ViewModelBase.cs
@@ -0,0 +1,17 @@
+using System.ComponentModel;
+
+namespace AvalonDock.VS2013Test.ViewModels
+{
+	class ViewModelBase : INotifyPropertyChanged
+	{
+
+		protected virtual void RaisePropertyChanged(string propertyName)
+		{
+			if (PropertyChanged != null)
+				PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+		}
+
+
+		public event PropertyChangedEventHandler PropertyChanged;
+	}
+}
diff --git a/source/VS2013Test/ViewModels/Workspace.cs b/source/VS2013Test/ViewModels/Workspace.cs
new file mode 100644
index 00000000..98da41df
--- /dev/null
+++ b/source/VS2013Test/ViewModels/Workspace.cs
@@ -0,0 +1,267 @@
+using AvalonDock.Themes;
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Input;
+
+namespace AvalonDock.VS2013Test.ViewModels
+{
+	internal class Workspace : ViewModelBase
+	{
+		#region fields
+
+		private static Workspace _this = new Workspace();
+
+		private ToolViewModel[] _tools;
+		private ObservableCollection<FileViewModel> _files = new ObservableCollection<FileViewModel>();
+		private ReadOnlyObservableCollection<FileViewModel> _readonyFiles;
+		private FileViewModel _activeDocument;
+		private FileStatsViewModel _fileStats;
+		private ErrorViewModel _errors;
+		private PropertiesViewModel _props;
+		private ExplorerViewModel _explorer;
+		private OutputViewModel _output;
+		private RelayCommand _openCommand;
+		private RelayCommand _newCommand;
+		private Tuple<string, Theme> selectedTheme;
+
+		#endregion fields
+
+		#region constructors
+
+		/// <summary>
+		/// Class constructor
+		/// </summary>
+		public Workspace()
+		{
+			this.Themes = new List<Tuple<string, Theme>>
+			{
+				new Tuple<string, Theme>(nameof(Vs2013DarkTheme),new Vs2013DarkTheme()),
+				new Tuple<string, Theme>(nameof(Vs2013LightTheme),new Vs2013LightTheme()),
+				new Tuple<string, Theme>(nameof(Vs2013BlueTheme),new Vs2013BlueTheme())
+			};
+			this.SelectedTheme = Themes.First();
+		}
+
+		#endregion constructors
+
+		public event EventHandler ActiveDocumentChanged;
+
+		#region properties
+
+		public static Workspace This => _this;
+
+		public ReadOnlyObservableCollection<FileViewModel> Files
+		{
+			get
+			{
+				if (_readonyFiles == null)
+					_readonyFiles = new ReadOnlyObservableCollection<FileViewModel>(_files);
+
+				return _readonyFiles;
+			}
+		}
+
+		public IEnumerable<ToolViewModel> Tools
+		{
+			get
+			{
+				if (_tools == null)
+					_tools = new ToolViewModel[] { Explorer, Props, Errors, Output };
+				return _tools;
+			}
+		}
+
+		public FileStatsViewModel FileStats
+		{
+			get
+			{
+				if (_fileStats == null)
+					_fileStats = new FileStatsViewModel();
+
+				return _fileStats;
+			}
+		}
+
+		public ExplorerViewModel Explorer
+		{
+			get
+			{
+				if (_explorer == null)
+					_explorer = new ExplorerViewModel();
+
+				return _explorer;
+			}
+		}
+
+		public PropertiesViewModel Props
+		{
+			get
+			{
+				if (_props == null)
+					_props = new PropertiesViewModel();
+
+				return _props;
+			}
+		}
+
+		public ErrorViewModel Errors
+		{
+			get
+			{
+				if (_errors == null)
+					_errors = new ErrorViewModel();
+
+				return _errors;
+			}
+		}
+
+		public OutputViewModel Output
+		{
+			get
+			{
+				if (_output == null)
+					_output = new OutputViewModel();
+
+				return _output;
+			}
+		}
+
+		public ICommand OpenCommand
+		{
+			get
+			{
+				if (_openCommand == null)
+				{
+					_openCommand = new RelayCommand((p) => OnOpen(p), (p) => CanOpen(p));
+				}
+
+				return _openCommand;
+			}
+		}
+
+		public ICommand NewCommand
+		{
+			get
+			{
+				if (_newCommand == null)
+				{
+					_newCommand = new RelayCommand((p) => OnNew(p), (p) => CanNew(p));
+				}
+
+				return _newCommand;
+			}
+		}
+
+		public FileViewModel ActiveDocument
+		{
+			get => _activeDocument;
+			set
+			{
+				if (_activeDocument != value)
+				{
+					_activeDocument = value;
+					RaisePropertyChanged(nameof(ActiveDocument));
+					if (ActiveDocumentChanged != null)
+						ActiveDocumentChanged(this, EventArgs.Empty);
+				}
+			}
+		}
+
+		public List<Tuple<string, Theme>> Themes { get; set; }
+
+		public Tuple<string, Theme> SelectedTheme
+		{
+			get { return selectedTheme; }
+			set
+			{
+				selectedTheme = value;
+				RaisePropertyChanged(nameof(SelectedTheme));
+			}
+		}
+
+		#endregion properties
+
+		#region methods
+
+		internal void Close(FileViewModel fileToClose)
+		{
+			if (fileToClose.IsDirty)
+			{
+				var res = MessageBox.Show(string.Format("Save changes for file '{0}'?", fileToClose.FileName), "AvalonDock Test App", MessageBoxButton.YesNoCancel);
+				if (res == MessageBoxResult.Cancel)
+					return;
+				if (res == MessageBoxResult.Yes)
+				{
+					Save(fileToClose);
+				}
+			}
+
+			_files.Remove(fileToClose);
+		}
+
+		internal void Save(FileViewModel fileToSave, bool saveAsFlag = false)
+		{
+			if (fileToSave.FilePath == null || saveAsFlag)
+			{
+				var dlg = new SaveFileDialog();
+				if (dlg.ShowDialog().GetValueOrDefault())
+					fileToSave.FilePath = dlg.SafeFileName;
+			}
+			if (fileToSave.FilePath == null)
+			{
+				return;
+			}
+			File.WriteAllText(fileToSave.FilePath, fileToSave.TextContent);
+			ActiveDocument.IsDirty = false;
+		}
+
+		internal FileViewModel Open(string filepath)
+		{
+			var fileViewModel = _files.FirstOrDefault(fm => fm.FilePath == filepath);
+			if (fileViewModel != null)
+				return fileViewModel;
+
+			fileViewModel = new FileViewModel(filepath);
+			_files.Add(fileViewModel);
+			return fileViewModel;
+		}
+
+		#region OpenCommand
+
+		private bool CanOpen(object parameter) => true;
+
+		private void OnOpen(object parameter)
+		{
+			var dlg = new OpenFileDialog();
+			if (dlg.ShowDialog().GetValueOrDefault())
+			{
+				var fileViewModel = Open(dlg.FileName);
+				ActiveDocument = fileViewModel;
+			}
+		}
+
+		#endregion OpenCommand
+
+		#region NewCommand
+
+		private bool CanNew(object parameter)
+		{
+			return true;
+		}
+
+		private void OnNew(object parameter)
+		{
+			_files.Add(new FileViewModel());
+			ActiveDocument = _files.Last();
+		}
+
+		#endregion NewCommand
+
+		#endregion methods
+	}
+}
\ No newline at end of file
diff --git a/source/VS2013Test/Views/MainView.xaml b/source/VS2013Test/Views/MainView.xaml
new file mode 100644
index 00000000..304d659a
--- /dev/null
+++ b/source/VS2013Test/Views/MainView.xaml
@@ -0,0 +1,206 @@
+<Window x:Class="AvalonDock.VS2013Test.Views.MainView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:AvalonDock.VS2013Test"
+		xmlns:viewModels="clr-namespace:AvalonDock.VS2013Test.ViewModels"
+		xmlns:themes="clr-namespace:AvalonDock.Themes;assembly=AvalonDock.Themes.VS2013"
+		xmlns:icons="clr-namespace:VS2013Test.Icons"
+        mc:Ignorable="d"
+        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="720" Width="1280" SnapsToDevicePixels="True" Foreground="White" Background="#2d2d30" WindowStyle="None" ResizeMode="CanResize">
+
+	<Window.DataContext>
+		<viewModels:Workspace/>
+	</Window.DataContext>
+
+	<WindowChrome.WindowChrome>
+		<WindowChrome CaptionHeight="25" ResizeBorderThickness="8" CornerRadius="0" GlassFrameThickness="0" NonClientFrameEdges="None" />
+	</WindowChrome.WindowChrome>
+
+	<Window.Style>
+		<Style TargetType="{x:Type Window}">
+			<Setter Property="BorderThickness" Value="1" />
+			<Setter Property="BorderBrush" Value="#1982C4" />
+			<Style.Triggers>
+				<Trigger Property="IsActive" Value="False">
+					<Setter Property="BorderBrush" Value="#3F3F46"/>
+				</Trigger>
+				<Trigger Property="WindowState" Value="Maximized">
+					<Setter Property="BorderThickness" Value="0" />
+				</Trigger>
+			</Style.Triggers>
+		</Style>
+	</Window.Style>
+
+	<Grid>
+		<Grid.Style>
+			<Style TargetType="{x:Type Grid}">
+				<Style.Triggers>
+					<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource AncestorType=Window}}" Value="Maximized">
+						<Setter Property="Margin" Value="7,9,7,9" />
+					</DataTrigger>
+				</Style.Triggers>
+			</Style>
+		</Grid.Style>
+
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto"/>
+			<RowDefinition/>
+			<RowDefinition Height="Auto"/>
+		</Grid.RowDefinitions>
+
+		<WrapPanel Margin="8,4" HorizontalAlignment="Left">
+			<icons:VisualStudioIcon Margin="4,0,5,0" Height="20">
+				<UserControl.Style>
+					<Style TargetType="{x:Type UserControl}">
+						<Style.Triggers>
+							<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+								<Setter Property="Foreground" Value="#818181" />
+							</DataTrigger>
+						</Style.Triggers>
+					</Style>
+				</UserControl.Style>
+			</icons:VisualStudioIcon>
+			
+			<Menu VerticalAlignment="Center" WindowChrome.IsHitTestVisibleInChrome="True">
+				<MenuItem Header="File">
+					<MenuItem Command="{Binding NewCommand}" Header="New" />
+					<MenuItem Command="{Binding OpenCommand}" Header="Open" />
+					<Separator />
+					<MenuItem Command="{Binding ActiveDocument.SaveCommand}" Header="Save" />
+					<MenuItem Command="{Binding ActiveDocument.SaveAsCommand}" Header="Save As..." />
+					<Separator />
+					<MenuItem Command="{Binding ActiveDocument.CloseCommand}" Header="Close" />
+				</MenuItem>
+
+				<MenuItem Header="Edit"/>
+
+				<MenuItem Header="View">
+					<MenuItem Header="SolutionExplorer" IsCheckable="True" IsChecked="{Binding Explorer.IsVisible, Mode=TwoWay}" />
+					<MenuItem Header="Properties" IsCheckable="True" IsChecked="{Binding Props.IsVisible, Mode=TwoWay}" />
+					<MenuItem Header="Error List" IsCheckable="True" IsChecked="{Binding Errors.IsVisible, Mode=TwoWay}" />
+					<MenuItem Header="Output" IsCheckable="True" IsChecked="{Binding Output.IsVisible, Mode=TwoWay}" />
+				</MenuItem>
+				
+				<!--<MenuItem Header="Layout">
+					<MenuItem Command="{Binding LoadLayoutCommand, ElementName=mainWindow}" Header="Load" />
+					<MenuItem Command="{Binding SaveLayoutCommand, ElementName=mainWindow}" Header="Save" />
+					<MenuItem Click="OnDumpToConsole" Header="Dump to Console" />
+				</MenuItem>-->
+			</Menu>
+			
+			<ComboBox
+				 WindowChrome.IsHitTestVisibleInChrome="True"
+				DisplayMemberPath="Item1"
+				ItemsSource="{Binding Themes}"
+				SelectedItem="{Binding SelectedTheme}" />
+		</WrapPanel>
+
+		<DockingManager
+            Grid.Row="1"
+		    ActiveContent="{Binding ActiveDocument, Mode=TwoWay, Converter={StaticResource ActiveDocumentConverter}}"
+		    AnchorablesSource="{Binding Tools}"
+		    DocumentsSource="{Binding Files}"
+			Theme="{Binding SelectedTheme.Item2}">
+
+			<DockingManager.LayoutItemTemplateSelector>
+				<local:PanesTemplateSelector>
+					<local:PanesTemplateSelector.FileViewTemplate>
+						<DataTemplate>
+							<TextBox Background="Transparent" BorderThickness="0" Text="{Binding TextContent, UpdateSourceTrigger=PropertyChanged}" />
+						</DataTemplate>
+					</local:PanesTemplateSelector.FileViewTemplate>
+					<local:PanesTemplateSelector.FileStatsViewTemplate>
+						<DataTemplate>
+							<Border/>
+						</DataTemplate>
+					</local:PanesTemplateSelector.FileStatsViewTemplate>
+					<local:PanesTemplateSelector.PropertiesViewTemplate>
+						<DataTemplate>
+							<Border/>
+						</DataTemplate>
+					</local:PanesTemplateSelector.PropertiesViewTemplate>
+					<local:PanesTemplateSelector.ExplorerViewTemplate>
+						<DataTemplate>
+							<Border/>
+						</DataTemplate>
+					</local:PanesTemplateSelector.ExplorerViewTemplate>
+					<local:PanesTemplateSelector.ErrorViewTemplate>
+						<DataTemplate>
+							<Border/>
+						</DataTemplate>
+					</local:PanesTemplateSelector.ErrorViewTemplate>
+					<local:PanesTemplateSelector.OutputViewTemplate>
+						<DataTemplate>
+							<Border/>
+						</DataTemplate>
+					</local:PanesTemplateSelector.OutputViewTemplate>
+				</local:PanesTemplateSelector>
+			</DockingManager.LayoutItemTemplateSelector>
+
+			<DockingManager.LayoutItemContainerStyleSelector>
+				<local:PanesStyleSelector>
+					<local:PanesStyleSelector.ToolStyle>
+						<Style TargetType="{x:Type LayoutAnchorableItem}">
+							<Setter Property="Title" Value="{Binding Model.Title, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+							<Setter Property="Visibility" Value="{Binding Model.IsVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter={x:Static Visibility.Hidden}}" />
+							<Setter Property="ContentId" Value="{Binding Model.ContentId, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+							<Setter Property="IsSelected" Value="{Binding Model.IsSelected, Mode=TwoWay}" />
+							<Setter Property="IsActive" Value="{Binding Model.IsActive, Mode=TwoWay}" />
+							<Setter Property="CanHide" Value="True" />
+						</Style>
+					</local:PanesStyleSelector.ToolStyle>
+					<local:PanesStyleSelector.FileStyle>
+						<Style TargetType="{x:Type LayoutItem}">
+							<Setter Property="Title" Value="{Binding Model.Title}" />
+							<Setter Property="ToolTip" Value="{Binding Model.FilePath}" />
+							<Setter Property="IsActive" Value="{Binding Model.IsActive, Mode=TwoWay}" />
+							<Setter Property="CloseCommand" Value="{Binding Model.CloseCommand}" />
+							<Setter Property="IconSource" Value="{Binding Model.IconSource}" />
+							<Setter Property="ContentId" Value="{Binding Model.ContentId}" />
+							<Setter Property="CanClose" Value="True"/>
+						</Style>
+					</local:PanesStyleSelector.FileStyle>
+				</local:PanesStyleSelector>
+			</DockingManager.LayoutItemContainerStyleSelector>
+			<DockingManager.LayoutUpdateStrategy>
+				<local:LayoutInitializer />
+			</DockingManager.LayoutUpdateStrategy>
+
+			<LayoutRoot>
+				<LayoutPanel Orientation="Vertical">
+					<LayoutPanel>
+						<LayoutAnchorablePaneGroup DockWidth="256">
+							<LayoutAnchorablePane Name="ExplorerPane"/>
+						</LayoutAnchorablePaneGroup>
+
+						<LayoutDocumentPane/>
+
+						<LayoutAnchorablePaneGroup DockWidth="256">
+							<LayoutAnchorablePane Name="PropertiesPane"/>
+						</LayoutAnchorablePaneGroup>
+					</LayoutPanel>
+
+					<LayoutAnchorablePaneGroup DockHeight="128">
+						<LayoutAnchorablePane Name="ErrorPane"/>
+						<LayoutAnchorablePane Name="OutputPane"/>
+					</LayoutAnchorablePaneGroup>
+				</LayoutPanel>
+			</LayoutRoot>
+		</DockingManager>
+
+		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" WindowChrome.IsHitTestVisibleInChrome="True">
+			<Button Style="{StaticResource MinimizeButton}" Click="MinimizeClick" />
+			<Button Style="{StaticResource MaximizeButton}" Click="MaximizeClick" />
+			<Button Style="{StaticResource RestoreDownButton}" Click="RestoreDownClick" />
+			<Button Style="{StaticResource CloseButton}" Click="CloseClick" />
+		</StackPanel>
+
+		<Border Grid.Row="2" Height="23" Background="#1982C4">
+			<Grid>
+				<TextBlock Text="Ready" VerticalAlignment="Center" Margin="6,0,0,0" />
+			</Grid>
+		</Border>
+	</Grid>
+</Window>
diff --git a/source/VS2013Test/MainView.xaml.cs b/source/VS2013Test/Views/MainView.xaml.cs
similarity index 96%
rename from source/VS2013Test/MainView.xaml.cs
rename to source/VS2013Test/Views/MainView.xaml.cs
index 79fbf41a..9e353ccc 100644
--- a/source/VS2013Test/MainView.xaml.cs
+++ b/source/VS2013Test/Views/MainView.xaml.cs
@@ -13,7 +13,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace VS2013Test
+namespace AvalonDock.VS2013Test.Views
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml

From 87d1aaf720db11518b5e44abab99fecccfa8d31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=A2=D1=80=D1=83=D1=88=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2?= <oleg_trushkov@hotmail.com>
Date: Thu, 24 Jun 2021 02:39:52 +0300
Subject: [PATCH 3/8] Added extended themes.

---
 source/VS2013Test/App.xaml                    |  7 ++--
 source/VS2013Test/App.xaml.cs                 |  4 +--
 .../VS2013Test/Themes/BlueBrushsExtended.xaml |  7 ++++
 .../VS2013Test/Themes/DarkBrushsExtended.xaml |  7 ++++
 .../Themes/LightBrushsExtended.xaml           |  7 ++++
 source/VS2013Test/VS2013Test.csproj           | 11 +++++++
 source/VS2013Test/ViewModels/Workspace.cs     | 33 ++++++++++++++-----
 source/VS2013Test/Views/MainView.xaml         | 20 ++++++-----
 8 files changed, 74 insertions(+), 22 deletions(-)
 create mode 100644 source/VS2013Test/Themes/BlueBrushsExtended.xaml
 create mode 100644 source/VS2013Test/Themes/DarkBrushsExtended.xaml
 create mode 100644 source/VS2013Test/Themes/LightBrushsExtended.xaml

diff --git a/source/VS2013Test/App.xaml b/source/VS2013Test/App.xaml
index 1f155968..17229089 100644
--- a/source/VS2013Test/App.xaml
+++ b/source/VS2013Test/App.xaml
@@ -7,14 +7,15 @@
     <Application.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary Source="pack://application:,,,/AvalonDock.Themes.VS2013;component/DarkBrushs.xaml" />
+				<ResourceDictionary Source="pack://application:,,,/VS2013Test;component/Themes/DarkBrushsExtended.xaml" />
+				<ResourceDictionary Source="pack://application:,,,/VS2013Test;component/Themes/Generic.xaml" />
+
 				<ResourceDictionary>
 					<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 					<BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
 					<converters:ActiveDocumentConverter x:Key="ActiveDocumentConverter" />
 				</ResourceDictionary>
-
-				<ResourceDictionary Source="pack://application:,,,/VS2013Test;component/Themes/Generic.xaml" />
-				<ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/DarkBrushs.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
 	</Application.Resources>
diff --git a/source/VS2013Test/App.xaml.cs b/source/VS2013Test/App.xaml.cs
index 8fa59c6b..f5747ade 100644
--- a/source/VS2013Test/App.xaml.cs
+++ b/source/VS2013Test/App.xaml.cs
@@ -6,6 +6,6 @@ namespace AvalonDock.VS2013Test
 	/// Interaction logic for App.xaml
 	/// </summary>
 	public partial class App : Application
-    {
-    }
+	{
+	}
 }
diff --git a/source/VS2013Test/Themes/BlueBrushsExtended.xaml b/source/VS2013Test/Themes/BlueBrushsExtended.xaml
new file mode 100644
index 00000000..ab79658b
--- /dev/null
+++ b/source/VS2013Test/Themes/BlueBrushsExtended.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<SolidColorBrush x:Key="IconBackground" Color="#854CC7" />
+	<SolidColorBrush x:Key="HeaderBackground" Color="#CCD5F0" />
+	<SolidColorBrush x:Key="StatusBarBackground" Color="#40508D" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/Themes/DarkBrushsExtended.xaml b/source/VS2013Test/Themes/DarkBrushsExtended.xaml
new file mode 100644
index 00000000..a873c8a0
--- /dev/null
+++ b/source/VS2013Test/Themes/DarkBrushsExtended.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<SolidColorBrush x:Key="IconBackground" Color="White" />
+	<SolidColorBrush x:Key="HeaderBackground" Color="#2D2D30" />
+	<SolidColorBrush x:Key="StatusBarBackground" Color="#007ACC" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/Themes/LightBrushsExtended.xaml b/source/VS2013Test/Themes/LightBrushsExtended.xaml
new file mode 100644
index 00000000..0337a096
--- /dev/null
+++ b/source/VS2013Test/Themes/LightBrushsExtended.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<SolidColorBrush x:Key="IconBackground" Color="#865FC5" />
+	<SolidColorBrush x:Key="HeaderBackground" Color="#EEEEF2" />
+	<SolidColorBrush x:Key="StatusBarBackground" Color="#007ACC" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/VS2013Test.csproj b/source/VS2013Test/VS2013Test.csproj
index f63849eb..1db14c16 100644
--- a/source/VS2013Test/VS2013Test.csproj
+++ b/source/VS2013Test/VS2013Test.csproj
@@ -10,4 +10,15 @@
     <ProjectReference Include="..\Components\AvalonDock.Themes.VS2013\AvalonDock.Themes.VS2013.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Page Update="Themes\BlueBrushsExtended.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Themes\LightBrushsExtended.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+
 </Project>
diff --git a/source/VS2013Test/ViewModels/Workspace.cs b/source/VS2013Test/ViewModels/Workspace.cs
index 98da41df..4222c745 100644
--- a/source/VS2013Test/ViewModels/Workspace.cs
+++ b/source/VS2013Test/ViewModels/Workspace.cs
@@ -38,13 +38,6 @@ internal class Workspace : ViewModelBase
 		/// </summary>
 		public Workspace()
 		{
-			this.Themes = new List<Tuple<string, Theme>>
-			{
-				new Tuple<string, Theme>(nameof(Vs2013DarkTheme),new Vs2013DarkTheme()),
-				new Tuple<string, Theme>(nameof(Vs2013LightTheme),new Vs2013LightTheme()),
-				new Tuple<string, Theme>(nameof(Vs2013BlueTheme),new Vs2013BlueTheme())
-			};
-			this.SelectedTheme = Themes.First();
 		}
 
 		#endregion constructors
@@ -172,7 +165,12 @@ public FileViewModel ActiveDocument
 			}
 		}
 
-		public List<Tuple<string, Theme>> Themes { get; set; }
+		public List<Tuple<string, Theme>> Themes { get; set; } = new List<Tuple<string, Theme>>
+		{
+			new Tuple<string, Theme>(nameof(Vs2013DarkTheme),new Vs2013DarkTheme()),
+			new Tuple<string, Theme>(nameof(Vs2013LightTheme),new Vs2013LightTheme()),
+			new Tuple<string, Theme>(nameof(Vs2013BlueTheme),new Vs2013BlueTheme())
+		};
 
 		public Tuple<string, Theme> SelectedTheme
 		{
@@ -180,6 +178,7 @@ public Tuple<string, Theme> SelectedTheme
 			set
 			{
 				selectedTheme = value;
+				SwitchExtendedTheme();
 				RaisePropertyChanged(nameof(SelectedTheme));
 			}
 		}
@@ -188,6 +187,24 @@ public Tuple<string, Theme> SelectedTheme
 
 		#region methods
 
+		private void SwitchExtendedTheme()
+		{
+			switch (selectedTheme.Item1)
+			{
+				case "Vs2013DarkTheme":
+					Application.Current.Resources.MergedDictionaries[1].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/DarkBrushsExtended.xaml");
+					break;
+				case "Vs2013LightTheme":
+					Application.Current.Resources.MergedDictionaries[1].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/LightBrushsExtended.xaml");
+					break;
+				case "Vs2013BlueTheme":
+					Application.Current.Resources.MergedDictionaries[1].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/BlueBrushsExtended.xaml");
+					break;
+				default:
+					break;
+			}
+		}
+
 		internal void Close(FileViewModel fileToClose)
 		{
 			if (fileToClose.IsDirty)
diff --git a/source/VS2013Test/Views/MainView.xaml b/source/VS2013Test/Views/MainView.xaml
index 304d659a..d0e5af35 100644
--- a/source/VS2013Test/Views/MainView.xaml
+++ b/source/VS2013Test/Views/MainView.xaml
@@ -5,10 +5,10 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:AvalonDock.VS2013Test"
 		xmlns:viewModels="clr-namespace:AvalonDock.VS2013Test.ViewModels"
-		xmlns:themes="clr-namespace:AvalonDock.Themes;assembly=AvalonDock.Themes.VS2013"
+		xmlns:reskeys="clr-namespace:AvalonDock.Themes.VS2013.Themes;assembly=AvalonDock.Themes.VS2013"
 		xmlns:icons="clr-namespace:VS2013Test.Icons"
         mc:Ignorable="d"
-        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="720" Width="1280" SnapsToDevicePixels="True" Foreground="White" Background="#2d2d30" WindowStyle="None" ResizeMode="CanResize">
+        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="720" Width="1280" SnapsToDevicePixels="True" Foreground="White" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResize">
 
 	<Window.DataContext>
 		<viewModels:Workspace/>
@@ -50,10 +50,12 @@
 			<RowDefinition Height="Auto"/>
 		</Grid.RowDefinitions>
 
-		<WrapPanel Margin="8,4" HorizontalAlignment="Left">
-			<icons:VisualStudioIcon Margin="4,0,5,0" Height="20">
+		<StackPanel Margin="8,4" HorizontalAlignment="Left" Orientation="Horizontal">
+			<icons:VisualStudioIcon Margin="4,0" Height="20">
 				<UserControl.Style>
 					<Style TargetType="{x:Type UserControl}">
+						<Setter Property="Foreground" Value="{DynamicResource IconBackground}"/>
+						
 						<Style.Triggers>
 							<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
 								<Setter Property="Foreground" Value="#818181" />
@@ -90,12 +92,12 @@
 				</MenuItem>-->
 			</Menu>
 			
-			<ComboBox
+			<ComboBox Margin="4,0"
 				 WindowChrome.IsHitTestVisibleInChrome="True"
 				DisplayMemberPath="Item1"
 				ItemsSource="{Binding Themes}"
-				SelectedItem="{Binding SelectedTheme}" />
-		</WrapPanel>
+				SelectedItem="{Binding SelectedTheme}" SelectedIndex="0" />
+		</StackPanel>
 
 		<DockingManager
             Grid.Row="1"
@@ -197,9 +199,9 @@
 			<Button Style="{StaticResource CloseButton}" Click="CloseClick" />
 		</StackPanel>
 
-		<Border Grid.Row="2" Height="23" Background="#1982C4">
+		<Border Grid.Row="2" Height="23" Background="{DynamicResource StatusBarBackground}">
 			<Grid>
-				<TextBlock Text="Ready" VerticalAlignment="Center" Margin="6,0,0,0" />
+				<TextBlock Text="Ready" VerticalAlignment="Center" Margin="6,0" />
 			</Grid>
 		</Border>
 	</Grid>

From 882760e1c8feff0cf3902b4c14a8657f60896bc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=A2=D1=80=D1=83=D1=88=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2?= <oleg_trushkov@hotmail.com>
Date: Fri, 25 Jun 2021 00:35:25 +0300
Subject: [PATCH 4/8] Added extended theme colors.

---
 source/VS2013Test/App.xaml                    |  1 -
 .../VS2013Test/Themes/BlueBrushsExtended.xaml | 12 ++++-
 .../VS2013Test/Themes/DarkBrushsExtended.xaml | 12 ++++-
 source/VS2013Test/Themes/Generic.xaml         | 46 +++++++++----------
 .../Themes/LightBrushsExtended.xaml           | 12 ++++-
 source/VS2013Test/ViewModels/Workspace.cs     |  6 +--
 source/VS2013Test/Views/MainView.xaml         | 15 +++---
 7 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/source/VS2013Test/App.xaml b/source/VS2013Test/App.xaml
index 17229089..26b5b38b 100644
--- a/source/VS2013Test/App.xaml
+++ b/source/VS2013Test/App.xaml
@@ -7,7 +7,6 @@
     <Application.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
-				<ResourceDictionary Source="pack://application:,,,/AvalonDock.Themes.VS2013;component/DarkBrushs.xaml" />
 				<ResourceDictionary Source="pack://application:,,,/VS2013Test;component/Themes/DarkBrushsExtended.xaml" />
 				<ResourceDictionary Source="pack://application:,,,/VS2013Test;component/Themes/Generic.xaml" />
 
diff --git a/source/VS2013Test/Themes/BlueBrushsExtended.xaml b/source/VS2013Test/Themes/BlueBrushsExtended.xaml
index ab79658b..1d5f2d72 100644
--- a/source/VS2013Test/Themes/BlueBrushsExtended.xaml
+++ b/source/VS2013Test/Themes/BlueBrushsExtended.xaml
@@ -1,7 +1,17 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-	<SolidColorBrush x:Key="IconBackground" Color="#854CC7" />
+	<SolidColorBrush x:Key="IconBrush" Color="#854CC7" />
+	<SolidColorBrush x:Key="IconInactiveBrush" Color="#98A3C6" />
 	<SolidColorBrush x:Key="HeaderBackground" Color="#CCD5F0" />
 	<SolidColorBrush x:Key="StatusBarBackground" Color="#40508D" />
+	<SolidColorBrush x:Key="StatusBarForeground" Color="White" />
+	<SolidColorBrush x:Key="SystemButtonsForeground" Color="#4C5787" />
+	<SolidColorBrush x:Key="SystemButtonsInactiveForeground" Color="#98A3C6" />
+	<SolidColorBrush x:Key="SystemButtonsMouseOverBackground" Color="#F8F9FF" />
+	<SolidColorBrush x:Key="SystemButtonsMousePressedForeground" Color="#4C5787" />
+	<SolidColorBrush x:Key="SystemButtonsMousePressedBackground" Color="White" />
+	<SolidColorBrush x:Key="WindowForeground" Color="Black" />
+	<SolidColorBrush x:Key="WindowBorderBrush" Color="#1F3C76" />
+	<SolidColorBrush x:Key="WindowInactiveBorderBrush" Color="#515151" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/Themes/DarkBrushsExtended.xaml b/source/VS2013Test/Themes/DarkBrushsExtended.xaml
index a873c8a0..cd3c9d09 100644
--- a/source/VS2013Test/Themes/DarkBrushsExtended.xaml
+++ b/source/VS2013Test/Themes/DarkBrushsExtended.xaml
@@ -1,7 +1,17 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-	<SolidColorBrush x:Key="IconBackground" Color="White" />
+	<SolidColorBrush x:Key="IconBrush" Color="White" />
+	<SolidColorBrush x:Key="IconInactiveBrush" Color="#818183" />
 	<SolidColorBrush x:Key="HeaderBackground" Color="#2D2D30" />
 	<SolidColorBrush x:Key="StatusBarBackground" Color="#007ACC" />
+	<SolidColorBrush x:Key="StatusBarForeground" Color="White" />
+	<SolidColorBrush x:Key="SystemButtonsForeground" Color="White" />
+	<SolidColorBrush x:Key="SystemButtonsInactiveForeground" Color="#818183" />
+	<SolidColorBrush x:Key="SystemButtonsMouseOverBackground" Color="#393939" />
+	<SolidColorBrush x:Key="SystemButtonsMousePressedForeground" Color="White" />
+	<SolidColorBrush x:Key="SystemButtonsMousePressedBackground" Color="#007ACC" />
+	<SolidColorBrush x:Key="WindowForeground" Color="White" />
+	<SolidColorBrush x:Key="WindowBorderBrush" Color="#007ACC" />
+	<SolidColorBrush x:Key="WindowInactiveBorderBrush" Color="#434346" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/Themes/Generic.xaml b/source/VS2013Test/Themes/Generic.xaml
index 0eea1147..5b7e481b 100644
--- a/source/VS2013Test/Themes/Generic.xaml
+++ b/source/VS2013Test/Themes/Generic.xaml
@@ -7,7 +7,7 @@
 		<Setter Property="Focusable" Value="False"/>
 		<Setter Property="ToolTip" Value="Close"/>
 		<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
-		<Setter Property="Foreground" Value="White"/>
+		<Setter Property="Foreground" Value="{DynamicResource SystemButtonsForeground}"/>
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Button}">
@@ -17,13 +17,14 @@
 
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Background" Value="#393939"/>
+							<Setter Property="Background" Value="{DynamicResource SystemButtonsMouseOverBackground}"/>
 						</Trigger>
 						<Trigger Property="IsPressed" Value="true">
-							<Setter Property="Background" Value="#1982C4"/>
+							<Setter Property="Foreground" Value="{DynamicResource SystemButtonsMousePressedForeground}"/>
+							<Setter Property="Background" Value="{DynamicResource SystemButtonsMousePressedBackground}"/>
 						</Trigger>
 						<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-							<Setter Property="Foreground" Value="#818181" />
+							<Setter Property="Foreground" Value="{DynamicResource SystemButtonsInactiveForeground}" />
 						</DataTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -37,7 +38,7 @@
 		<Setter Property="IsTabStop" Value="False"/>
 		<Setter Property="Focusable" Value="False"/>
 		<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
-		<Setter Property="Foreground" Value="White"/>
+		<Setter Property="Foreground" Value="{DynamicResource SystemButtonsForeground}"/>
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Button}">
@@ -47,16 +48,17 @@
 
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Background" Value="#393939"/>
+							<Setter Property="Background" Value="{DynamicResource SystemButtonsMouseOverBackground}"/>
 						</Trigger>
 						<Trigger Property="IsPressed" Value="true">
-							<Setter Property="Background" Value="#1982C4"/>
+							<Setter Property="Foreground" Value="{DynamicResource SystemButtonsMousePressedForeground}"/>
+							<Setter Property="Background" Value="{DynamicResource SystemButtonsMousePressedBackground}"/>
 						</Trigger>
 						<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="Maximized">
 							<Setter Property="Visibility" Value="Collapsed"/>
 						</DataTrigger>
 						<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-							<Setter Property="Foreground" Value="#818181" />
+							<Setter Property="Foreground" Value="{DynamicResource SystemButtonsInactiveForeground}" />
 						</DataTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -71,7 +73,7 @@
 		<Setter Property="Focusable" Value="False"/>
 		<Setter Property="ToolTip" Value="Restore Down"/>
 		<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
-		<Setter Property="Foreground" Value="White"/>
+		<Setter Property="Foreground" Value="{DynamicResource SystemButtonsForeground}"/>
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Button}">
@@ -81,16 +83,17 @@
 
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Background" Value="#393939"/>
+							<Setter Property="Background" Value="{DynamicResource SystemButtonsMouseOverBackground}"/>
 						</Trigger>
 						<Trigger Property="IsPressed" Value="true">
-							<Setter Property="Background" Value="#1982C4"/>
+							<Setter Property="Foreground" Value="{DynamicResource SystemButtonsMousePressedForeground}"/>
+							<Setter Property="Background" Value="{DynamicResource SystemButtonsMousePressedBackground}"/>
 						</Trigger>
 						<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="Maximized">
 							<Setter Property="Visibility" Value="Visible"/>
 						</DataTrigger>
 						<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-							<Setter Property="Foreground" Value="#818181" />
+							<Setter Property="Foreground" Value="{DynamicResource SystemButtonsInactiveForeground}" />
 						</DataTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -105,7 +108,7 @@
 		<Setter Property="Focusable" Value="False"/>
 		<Setter Property="ToolTip" Value="Minimize"/>
 		<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
-		<Setter Property="Foreground" Value="White"/>
+		<Setter Property="Foreground" Value="{DynamicResource SystemButtonsForeground}"/>
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Button}">
@@ -115,19 +118,14 @@
 
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Background" Value="#393939"/>
+							<Setter Property="Background" Value="{DynamicResource SystemButtonsMouseOverBackground}"/>
+						</Trigger>
+						<Trigger Property="IsPressed" Value="true">
+							<Setter Property="Foreground" Value="{DynamicResource SystemButtonsMousePressedForeground}"/>
+							<Setter Property="Background" Value="{DynamicResource SystemButtonsMousePressedBackground}"/>
 						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsMouseOver" Value="True" />
-								<Condition Property="IsPressed" Value="True" />
-							</MultiTrigger.Conditions>
-							<MultiTrigger.Setters>
-								<Setter Property="Background" Value="#1982C4"/>
-							</MultiTrigger.Setters>
-						</MultiTrigger>
 						<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-							<Setter Property="Foreground" Value="#818181" />
+							<Setter Property="Foreground" Value="{DynamicResource SystemButtonsInactiveForeground}" />
 						</DataTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
diff --git a/source/VS2013Test/Themes/LightBrushsExtended.xaml b/source/VS2013Test/Themes/LightBrushsExtended.xaml
index 0337a096..f827aebb 100644
--- a/source/VS2013Test/Themes/LightBrushsExtended.xaml
+++ b/source/VS2013Test/Themes/LightBrushsExtended.xaml
@@ -1,7 +1,17 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-	<SolidColorBrush x:Key="IconBackground" Color="#865FC5" />
+	<SolidColorBrush x:Key="IconBrush" Color="#865FC5" />
+	<SolidColorBrush x:Key="IconInactiveBrush" Color="#8F8F91" />
 	<SolidColorBrush x:Key="HeaderBackground" Color="#EEEEF2" />
 	<SolidColorBrush x:Key="StatusBarBackground" Color="#007ACC" />
+	<SolidColorBrush x:Key="StatusBarForeground" Color="White" />
+	<SolidColorBrush x:Key="SystemButtonsForeground" Color="Black" />
+	<SolidColorBrush x:Key="SystemButtonsInactiveForeground" Color="#8F8F91" />
+	<SolidColorBrush x:Key="SystemButtonsMouseOverBackground" Color="#FCFCFD" />
+	<SolidColorBrush x:Key="SystemButtonsMousePressedForeground" Color="White" />
+	<SolidColorBrush x:Key="SystemButtonsMousePressedBackground" Color="#007ACC" />
+	<SolidColorBrush x:Key="WindowForeground" Color="Black" />
+	<SolidColorBrush x:Key="WindowBorderBrush" Color="#9A9EB8" />
+	<SolidColorBrush x:Key="WindowInactiveBorderBrush" Color="#CBCDDA" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/ViewModels/Workspace.cs b/source/VS2013Test/ViewModels/Workspace.cs
index 4222c745..70380645 100644
--- a/source/VS2013Test/ViewModels/Workspace.cs
+++ b/source/VS2013Test/ViewModels/Workspace.cs
@@ -192,13 +192,13 @@ private void SwitchExtendedTheme()
 			switch (selectedTheme.Item1)
 			{
 				case "Vs2013DarkTheme":
-					Application.Current.Resources.MergedDictionaries[1].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/DarkBrushsExtended.xaml");
+					Application.Current.Resources.MergedDictionaries[0].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/DarkBrushsExtended.xaml");
 					break;
 				case "Vs2013LightTheme":
-					Application.Current.Resources.MergedDictionaries[1].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/LightBrushsExtended.xaml");
+					Application.Current.Resources.MergedDictionaries[0].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/LightBrushsExtended.xaml");
 					break;
 				case "Vs2013BlueTheme":
-					Application.Current.Resources.MergedDictionaries[1].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/BlueBrushsExtended.xaml");
+					Application.Current.Resources.MergedDictionaries[0].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/BlueBrushsExtended.xaml");
 					break;
 				default:
 					break;
diff --git a/source/VS2013Test/Views/MainView.xaml b/source/VS2013Test/Views/MainView.xaml
index d0e5af35..b6f4862d 100644
--- a/source/VS2013Test/Views/MainView.xaml
+++ b/source/VS2013Test/Views/MainView.xaml
@@ -5,10 +5,9 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:AvalonDock.VS2013Test"
 		xmlns:viewModels="clr-namespace:AvalonDock.VS2013Test.ViewModels"
-		xmlns:reskeys="clr-namespace:AvalonDock.Themes.VS2013.Themes;assembly=AvalonDock.Themes.VS2013"
 		xmlns:icons="clr-namespace:VS2013Test.Icons"
         mc:Ignorable="d"
-        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="720" Width="1280" SnapsToDevicePixels="True" Foreground="White" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResize">
+        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="720" Width="1280" SnapsToDevicePixels="True" UseLayoutRounding="True" Foreground="{DynamicResource WindowForeground}" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResize">
 
 	<Window.DataContext>
 		<viewModels:Workspace/>
@@ -21,10 +20,10 @@
 	<Window.Style>
 		<Style TargetType="{x:Type Window}">
 			<Setter Property="BorderThickness" Value="1" />
-			<Setter Property="BorderBrush" Value="#1982C4" />
+			<Setter Property="BorderBrush" Value="{DynamicResource WindowBorderBrush}" />
 			<Style.Triggers>
 				<Trigger Property="IsActive" Value="False">
-					<Setter Property="BorderBrush" Value="#3F3F46"/>
+					<Setter Property="BorderBrush" Value="{DynamicResource WindowInactiveBorderBrush}"/>
 				</Trigger>
 				<Trigger Property="WindowState" Value="Maximized">
 					<Setter Property="BorderThickness" Value="0" />
@@ -38,7 +37,7 @@
 			<Style TargetType="{x:Type Grid}">
 				<Style.Triggers>
 					<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource AncestorType=Window}}" Value="Maximized">
-						<Setter Property="Margin" Value="7,9,7,9" />
+						<Setter Property="Margin" Value="7,7,7,9" />
 					</DataTrigger>
 				</Style.Triggers>
 			</Style>
@@ -54,11 +53,11 @@
 			<icons:VisualStudioIcon Margin="4,0" Height="20">
 				<UserControl.Style>
 					<Style TargetType="{x:Type UserControl}">
-						<Setter Property="Foreground" Value="{DynamicResource IconBackground}"/>
+						<Setter Property="Foreground" Value="{DynamicResource IconBrush}"/>
 						
 						<Style.Triggers>
 							<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-								<Setter Property="Foreground" Value="#818181" />
+								<Setter Property="Foreground" Value="{DynamicResource IconInactiveBrush}" />
 							</DataTrigger>
 						</Style.Triggers>
 					</Style>
@@ -201,7 +200,7 @@
 
 		<Border Grid.Row="2" Height="23" Background="{DynamicResource StatusBarBackground}">
 			<Grid>
-				<TextBlock Text="Ready" VerticalAlignment="Center" Margin="6,0" />
+				<TextBlock Text="Ready" Foreground="{DynamicResource StatusBarForeground}" VerticalAlignment="Center" Margin="6,0" />
 			</Grid>
 		</Border>
 	</Grid>

From 2d17189c960ee6ab4ff2dbc19f825094af875783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=A2=D1=80=D1=83=D1=88=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2?= <oleg_trushkov@hotmail.com>
Date: Fri, 25 Jun 2021 01:58:50 +0300
Subject: [PATCH 5/8] Fixed some margins.

---
 source/VS2013Test/Views/MainView.xaml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/source/VS2013Test/Views/MainView.xaml b/source/VS2013Test/Views/MainView.xaml
index b6f4862d..40202548 100644
--- a/source/VS2013Test/Views/MainView.xaml
+++ b/source/VS2013Test/Views/MainView.xaml
@@ -7,7 +7,7 @@
 		xmlns:viewModels="clr-namespace:AvalonDock.VS2013Test.ViewModels"
 		xmlns:icons="clr-namespace:VS2013Test.Icons"
         mc:Ignorable="d"
-        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="720" Width="1280" SnapsToDevicePixels="True" UseLayoutRounding="True" Foreground="{DynamicResource WindowForeground}" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResize">
+        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="720" Width="1280" SnapsToDevicePixels="True" Foreground="{DynamicResource WindowForeground}" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResize">
 
 	<Window.DataContext>
 		<viewModels:Workspace/>
@@ -25,9 +25,6 @@
 				<Trigger Property="IsActive" Value="False">
 					<Setter Property="BorderBrush" Value="{DynamicResource WindowInactiveBorderBrush}"/>
 				</Trigger>
-				<Trigger Property="WindowState" Value="Maximized">
-					<Setter Property="BorderThickness" Value="0" />
-				</Trigger>
 			</Style.Triggers>
 		</Style>
 	</Window.Style>
@@ -37,7 +34,7 @@
 			<Style TargetType="{x:Type Grid}">
 				<Style.Triggers>
 					<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource AncestorType=Window}}" Value="Maximized">
-						<Setter Property="Margin" Value="7,7,7,9" />
+						<Setter Property="Margin" Value="6,6,6,8" />
 					</DataTrigger>
 				</Style.Triggers>
 			</Style>
@@ -200,7 +197,18 @@
 
 		<Border Grid.Row="2" Height="23" Background="{DynamicResource StatusBarBackground}">
 			<Grid>
-				<TextBlock Text="Ready" Foreground="{DynamicResource StatusBarForeground}" VerticalAlignment="Center" Margin="6,0" />
+				<StackPanel Orientation="Horizontal">
+					<Path Stroke="White" StrokeThickness="1" VerticalAlignment="Bottom" Margin="7.5,0,8,5">
+						<Path.Data>
+							<RectangleGeometry Rect="0,0,12,10"/>
+						</Path.Data>
+						<Path.RenderTransform>
+							<SkewTransform AngleX="-15">
+							</SkewTransform>
+						</Path.RenderTransform>
+					</Path>
+					<TextBlock Text="Ready" Foreground="{DynamicResource StatusBarForeground}" VerticalAlignment="Center" Margin="0,0,6,1" />
+				</StackPanel>
 			</Grid>
 		</Border>
 	</Grid>

From f033060009602c191c5aba3de71351b93c2de936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=A2=D1=80=D1=83=D1=88=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2?= <oleg_trushkov@hotmail.com>
Date: Fri, 25 Jun 2021 16:55:35 +0300
Subject: [PATCH 6/8] Updated layout. Added new tools.

---
 source/VS2013Test/LayoutInitializer.cs        |  45 +++--
 source/VS2013Test/PanesTemplateSelector.cs    |  18 ++
 .../VS2013Test/Themes/BlueBrushsExtended.xaml |   4 +
 .../VS2013Test/Themes/DarkBrushsExtended.xaml |   4 +
 .../Themes/LightBrushsExtended.xaml           |   4 +
 .../ViewModels/GitChangesViewModel.cs         | 109 ++++++++++
 .../VS2013Test/ViewModels/ToolboxViewModel.cs | 109 ++++++++++
 source/VS2013Test/ViewModels/Workspace.cs     |  26 ++-
 source/VS2013Test/Views/MainView.xaml         | 190 ++++++++++++------
 9 files changed, 436 insertions(+), 73 deletions(-)
 create mode 100644 source/VS2013Test/ViewModels/GitChangesViewModel.cs
 create mode 100644 source/VS2013Test/ViewModels/ToolboxViewModel.cs

diff --git a/source/VS2013Test/LayoutInitializer.cs b/source/VS2013Test/LayoutInitializer.cs
index 7a3e0957..16205735 100644
--- a/source/VS2013Test/LayoutInitializer.cs
+++ b/source/VS2013Test/LayoutInitializer.cs
@@ -52,30 +52,51 @@ public bool BeforeInsertAnchorable(LayoutRoot layout, LayoutAnchorable anchorabl
 				}
 			}
 
-			if (anchorableToShow.Content is ErrorViewModel)
+			if (anchorableToShow.Content is OutputViewModel)
 			{
 				anchorableToShow.AutoHideHeight = 128;
 
-				var scriptEditorPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "ErrorPane");
+				var outputPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "OutputPane");
 
-				if (scriptEditorPane != null)
+				if (outputPane != null)
 				{
-					scriptEditorPane.Children.Add(anchorableToShow);
+					outputPane.Children.Add(anchorableToShow);
 					return true;
 				}
 			}
 
-			if (anchorableToShow.Content is OutputViewModel)
+			if (anchorableToShow.Content is ToolboxViewModel)
 			{
-				anchorableToShow.AutoHideHeight = 128;
+				var leftGroup = new LayoutAnchorGroup();
+				leftGroup.Children.Add(anchorableToShow);
 
-				var outputPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "OutputPane");
+				anchorableToShow.AutoHideWidth = 256;
 
-				if (outputPane != null)
-				{
-					outputPane.Children.Add(anchorableToShow);
-					return true;
-				}
+				layout.LeftSide.Children.Add(leftGroup);
+				return true;
+			}
+
+			if (anchorableToShow.Content is GitChangesViewModel)
+			{
+				var rightGroup = new LayoutAnchorGroup();
+				rightGroup.Children.Add(anchorableToShow);
+
+				anchorableToShow.AutoHideWidth = 256;
+
+				layout.RightSide.Children.Add(rightGroup);
+				return true;
+			}
+
+			if (anchorableToShow.Content is ErrorViewModel)
+			{
+				var bottomGroup = new LayoutAnchorGroup();
+				bottomGroup.Children.Add(anchorableToShow);
+
+				anchorableToShow.AutoHideWidth = 256;
+				anchorableToShow.AutoHideHeight = 128;
+
+				layout.BottomSide.Children.Add(bottomGroup);
+				return true;
 			}
 
 			return false;
diff --git a/source/VS2013Test/PanesTemplateSelector.cs b/source/VS2013Test/PanesTemplateSelector.cs
index 6caae624..7be3babb 100644
--- a/source/VS2013Test/PanesTemplateSelector.cs
+++ b/source/VS2013Test/PanesTemplateSelector.cs
@@ -47,6 +47,18 @@ public DataTemplate OutputViewTemplate
 			set;
 		}
 
+		public DataTemplate GitChangesViewTemplate
+		{
+			get;
+			set;
+		}
+
+		public DataTemplate ToolboxViewTemplate
+		{
+			get;
+			set;
+		}
+
 		public override DataTemplate SelectTemplate(object item, DependencyObject container)
 		{
 			var itemAsLayoutContent = item as LayoutContent;
@@ -69,6 +81,12 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
 			if (item is OutputViewModel)
 				return OutputViewTemplate;
 
+			if (item is GitChangesViewModel)
+				return GitChangesViewTemplate;
+
+			if (item is ToolboxViewModel)
+				return ToolboxViewTemplate;
+
 			return base.SelectTemplate(item, container);
 		}
 	}
diff --git a/source/VS2013Test/Themes/BlueBrushsExtended.xaml b/source/VS2013Test/Themes/BlueBrushsExtended.xaml
index 1d5f2d72..e87256c6 100644
--- a/source/VS2013Test/Themes/BlueBrushsExtended.xaml
+++ b/source/VS2013Test/Themes/BlueBrushsExtended.xaml
@@ -14,4 +14,8 @@
 	<SolidColorBrush x:Key="WindowForeground" Color="Black" />
 	<SolidColorBrush x:Key="WindowBorderBrush" Color="#1F3C76" />
 	<SolidColorBrush x:Key="WindowInactiveBorderBrush" Color="#515151" />
+	<SolidColorBrush x:Key="ToolBarGripper" Color="#3A4470" />
+	<SolidColorBrush x:Key="ProjectNameForeground" Color="#40508D" />
+	<SolidColorBrush x:Key="ProjectNameInactiveForeground" Color="#A3ABCA" />
+	<SolidColorBrush x:Key="ProjectNameBackground" Color="#D9E0F8" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/Themes/DarkBrushsExtended.xaml b/source/VS2013Test/Themes/DarkBrushsExtended.xaml
index cd3c9d09..69e58c59 100644
--- a/source/VS2013Test/Themes/DarkBrushsExtended.xaml
+++ b/source/VS2013Test/Themes/DarkBrushsExtended.xaml
@@ -14,4 +14,8 @@
 	<SolidColorBrush x:Key="WindowForeground" Color="White" />
 	<SolidColorBrush x:Key="WindowBorderBrush" Color="#007ACC" />
 	<SolidColorBrush x:Key="WindowInactiveBorderBrush" Color="#434346" />
+	<SolidColorBrush x:Key="ToolBarGripper" Color="#656565" />
+	<SolidColorBrush x:Key="ProjectNameForeground" Color="White" />
+	<SolidColorBrush x:Key="ProjectNameInactiveForeground" Color="#818181" />
+	<SolidColorBrush x:Key="ProjectNameBackground" Color="#252526" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/Themes/LightBrushsExtended.xaml b/source/VS2013Test/Themes/LightBrushsExtended.xaml
index f827aebb..27954039 100644
--- a/source/VS2013Test/Themes/LightBrushsExtended.xaml
+++ b/source/VS2013Test/Themes/LightBrushsExtended.xaml
@@ -14,4 +14,8 @@
 	<SolidColorBrush x:Key="WindowForeground" Color="Black" />
 	<SolidColorBrush x:Key="WindowBorderBrush" Color="#9A9EB8" />
 	<SolidColorBrush x:Key="WindowInactiveBorderBrush" Color="#CBCDDA" />
+	<SolidColorBrush x:Key="ToolBarGripper" Color="#999999" />
+	<SolidColorBrush x:Key="ProjectNameForeground" Color="Black" />
+	<SolidColorBrush x:Key="ProjectNameInactiveForeground" Color="#929496" />
+	<SolidColorBrush x:Key="ProjectNameBackground" Color="#E0E3E6" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/ViewModels/GitChangesViewModel.cs b/source/VS2013Test/ViewModels/GitChangesViewModel.cs
new file mode 100644
index 00000000..9224fafd
--- /dev/null
+++ b/source/VS2013Test/ViewModels/GitChangesViewModel.cs
@@ -0,0 +1,109 @@
+using System;
+using System.IO;
+using System.Windows.Media.Imaging;
+
+namespace AvalonDock.VS2013Test.ViewModels
+{
+	internal class GitChangesViewModel : ToolViewModel
+	{
+		#region fields
+		public const string ToolContentId = "FileStatsTool";
+		private DateTime _lastModified;
+		private long _fileSize;
+		private string _FileName;
+		private string _FilePath;
+		#endregion fields
+
+		#region constructors
+		/// <summary>
+		/// Class constructor
+		/// </summary>
+		public GitChangesViewModel()
+			: base("Git Changes")
+		{
+			Workspace.This.ActiveDocumentChanged += new EventHandler(OnActiveDocumentChanged);
+			ContentId = ToolContentId;
+		}
+		#endregion constructors
+
+		#region Properties
+
+		public long FileSize
+		{
+			get => _fileSize;
+			protected set
+			{
+				if (_fileSize != value)
+				{
+					_fileSize = value;
+					RaisePropertyChanged(nameof(FileSize));
+				}
+			}
+		}
+
+		public DateTime LastModified
+		{
+			get => _lastModified;
+			protected set
+			{
+				if (_lastModified != value)
+				{
+					_lastModified = value;
+					RaisePropertyChanged(nameof(LastModified));
+				}
+			}
+		}
+
+		public string FileName
+		{
+			get => _FileName;
+			protected set
+			{
+				if (_FileName != value)
+				{
+					_FileName = value;
+					RaisePropertyChanged(nameof(FileName));
+				}
+			}
+		}
+
+		public string FilePath
+		{
+			get => _FilePath;
+			protected set
+			{
+				if (_FilePath != value)
+				{
+					_FilePath = value;
+					RaisePropertyChanged(nameof(FilePath));
+				}
+			}
+		}
+
+		#endregion Properties
+
+		#region methods
+		private void OnActiveDocumentChanged(object sender, EventArgs e)
+		{
+			if (Workspace.This.ActiveDocument != null &&
+				Workspace.This.ActiveDocument.FilePath != null &&
+				File.Exists(Workspace.This.ActiveDocument.FilePath))
+			{
+				var fi = new FileInfo(Workspace.This.ActiveDocument.FilePath);
+				FileSize = fi.Length;
+				LastModified = fi.LastWriteTime;
+				FileName = fi.Name;
+				FilePath = fi.Directory.FullName;
+			}
+			else
+			{
+				FileSize = 0;
+				LastModified = DateTime.MinValue;
+				FileName = string.Empty;
+				FilePath = string.Empty;
+			}
+		}
+		#endregion methods
+
+	}
+}
diff --git a/source/VS2013Test/ViewModels/ToolboxViewModel.cs b/source/VS2013Test/ViewModels/ToolboxViewModel.cs
new file mode 100644
index 00000000..616aefe6
--- /dev/null
+++ b/source/VS2013Test/ViewModels/ToolboxViewModel.cs
@@ -0,0 +1,109 @@
+using System;
+using System.IO;
+using System.Windows.Media.Imaging;
+
+namespace AvalonDock.VS2013Test.ViewModels
+{
+	internal class ToolboxViewModel : ToolViewModel
+	{
+		#region fields
+		public const string ToolContentId = "FileStatsTool";
+		private DateTime _lastModified;
+		private long _fileSize;
+		private string _FileName;
+		private string _FilePath;
+		#endregion fields
+
+		#region constructors
+		/// <summary>
+		/// Class constructor
+		/// </summary>
+		public ToolboxViewModel()
+			: base("Toolbox")
+		{
+			Workspace.This.ActiveDocumentChanged += new EventHandler(OnActiveDocumentChanged);
+			ContentId = ToolContentId;
+		}
+		#endregion constructors
+
+		#region Properties
+
+		public long FileSize
+		{
+			get => _fileSize;
+			protected set
+			{
+				if (_fileSize != value)
+				{
+					_fileSize = value;
+					RaisePropertyChanged(nameof(FileSize));
+				}
+			}
+		}
+
+		public DateTime LastModified
+		{
+			get => _lastModified;
+			protected set
+			{
+				if (_lastModified != value)
+				{
+					_lastModified = value;
+					RaisePropertyChanged(nameof(LastModified));
+				}
+			}
+		}
+
+		public string FileName
+		{
+			get => _FileName;
+			protected set
+			{
+				if (_FileName != value)
+				{
+					_FileName = value;
+					RaisePropertyChanged(nameof(FileName));
+				}
+			}
+		}
+
+		public string FilePath
+		{
+			get => _FilePath;
+			protected set
+			{
+				if (_FilePath != value)
+				{
+					_FilePath = value;
+					RaisePropertyChanged(nameof(FilePath));
+				}
+			}
+		}
+
+		#endregion Properties
+
+		#region methods
+		private void OnActiveDocumentChanged(object sender, EventArgs e)
+		{
+			if (Workspace.This.ActiveDocument != null &&
+				Workspace.This.ActiveDocument.FilePath != null &&
+				File.Exists(Workspace.This.ActiveDocument.FilePath))
+			{
+				var fi = new FileInfo(Workspace.This.ActiveDocument.FilePath);
+				FileSize = fi.Length;
+				LastModified = fi.LastWriteTime;
+				FileName = fi.Name;
+				FilePath = fi.Directory.FullName;
+			}
+			else
+			{
+				FileSize = 0;
+				LastModified = DateTime.MinValue;
+				FileName = string.Empty;
+				FilePath = string.Empty;
+			}
+		}
+		#endregion methods
+
+	}
+}
diff --git a/source/VS2013Test/ViewModels/Workspace.cs b/source/VS2013Test/ViewModels/Workspace.cs
index 70380645..48c579b8 100644
--- a/source/VS2013Test/ViewModels/Workspace.cs
+++ b/source/VS2013Test/ViewModels/Workspace.cs
@@ -25,6 +25,8 @@ internal class Workspace : ViewModelBase
 		private PropertiesViewModel _props;
 		private ExplorerViewModel _explorer;
 		private OutputViewModel _output;
+		private GitChangesViewModel _git;
+		private ToolboxViewModel _toolbox;
 		private RelayCommand _openCommand;
 		private RelayCommand _newCommand;
 		private Tuple<string, Theme> selectedTheme;
@@ -64,7 +66,7 @@ public IEnumerable<ToolViewModel> Tools
 			get
 			{
 				if (_tools == null)
-					_tools = new ToolViewModel[] { Explorer, Props, Errors, Output };
+					_tools = new ToolViewModel[] { Explorer, Props, Errors, Output, Git, Toolbox };
 				return _tools;
 			}
 		}
@@ -124,6 +126,28 @@ public OutputViewModel Output
 			}
 		}
 
+		public GitChangesViewModel Git
+		{
+			get
+			{
+				if (_git == null)
+					_git = new GitChangesViewModel();
+
+				return _git;
+			}
+		}
+
+		public ToolboxViewModel Toolbox
+		{
+			get
+			{
+				if (_toolbox == null)
+					_toolbox = new ToolboxViewModel();
+
+				return _toolbox;
+			}
+		}
+
 		public ICommand OpenCommand
 		{
 			get
diff --git a/source/VS2013Test/Views/MainView.xaml b/source/VS2013Test/Views/MainView.xaml
index 40202548..b51e430d 100644
--- a/source/VS2013Test/Views/MainView.xaml
+++ b/source/VS2013Test/Views/MainView.xaml
@@ -7,14 +7,14 @@
 		xmlns:viewModels="clr-namespace:AvalonDock.VS2013Test.ViewModels"
 		xmlns:icons="clr-namespace:VS2013Test.Icons"
         mc:Ignorable="d"
-        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="720" Width="1280" SnapsToDevicePixels="True" Foreground="{DynamicResource WindowForeground}" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResize">
+        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="900" Width="1600" SnapsToDevicePixels="True" Foreground="{DynamicResource WindowForeground}" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResize">
 
 	<Window.DataContext>
 		<viewModels:Workspace/>
 	</Window.DataContext>
 
 	<WindowChrome.WindowChrome>
-		<WindowChrome CaptionHeight="25" ResizeBorderThickness="8" CornerRadius="0" GlassFrameThickness="0" NonClientFrameEdges="None" />
+		<WindowChrome CaptionHeight="{Binding ElementName=header, Path=ActualHeight}" ResizeBorderThickness="8" CornerRadius="0" GlassFrameThickness="0" NonClientFrameEdges="None" />
 	</WindowChrome.WindowChrome>
 
 	<Window.Style>
@@ -46,54 +46,125 @@
 			<RowDefinition Height="Auto"/>
 		</Grid.RowDefinitions>
 
-		<StackPanel Margin="8,4" HorizontalAlignment="Left" Orientation="Horizontal">
-			<icons:VisualStudioIcon Margin="4,0" Height="20">
-				<UserControl.Style>
-					<Style TargetType="{x:Type UserControl}">
-						<Setter Property="Foreground" Value="{DynamicResource IconBrush}"/>
-						
-						<Style.Triggers>
-							<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-								<Setter Property="Foreground" Value="{DynamicResource IconInactiveBrush}" />
-							</DataTrigger>
-						</Style.Triggers>
-					</Style>
-				</UserControl.Style>
-			</icons:VisualStudioIcon>
-			
-			<Menu VerticalAlignment="Center" WindowChrome.IsHitTestVisibleInChrome="True">
-				<MenuItem Header="File">
-					<MenuItem Command="{Binding NewCommand}" Header="New" />
-					<MenuItem Command="{Binding OpenCommand}" Header="Open" />
-					<Separator />
-					<MenuItem Command="{Binding ActiveDocument.SaveCommand}" Header="Save" />
-					<MenuItem Command="{Binding ActiveDocument.SaveAsCommand}" Header="Save As..." />
-					<Separator />
-					<MenuItem Command="{Binding ActiveDocument.CloseCommand}" Header="Close" />
-				</MenuItem>
-
-				<MenuItem Header="Edit"/>
-
-				<MenuItem Header="View">
-					<MenuItem Header="SolutionExplorer" IsCheckable="True" IsChecked="{Binding Explorer.IsVisible, Mode=TwoWay}" />
-					<MenuItem Header="Properties" IsCheckable="True" IsChecked="{Binding Props.IsVisible, Mode=TwoWay}" />
-					<MenuItem Header="Error List" IsCheckable="True" IsChecked="{Binding Errors.IsVisible, Mode=TwoWay}" />
-					<MenuItem Header="Output" IsCheckable="True" IsChecked="{Binding Output.IsVisible, Mode=TwoWay}" />
-				</MenuItem>
-				
-				<!--<MenuItem Header="Layout">
+		<Grid x:Name="header">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto"/>
+				<RowDefinition Height="4"/>
+				<RowDefinition Height="Auto"/>
+			</Grid.RowDefinitions>
+
+			<StackPanel Margin="8,4" HorizontalAlignment="Left" Orientation="Horizontal">
+				<icons:VisualStudioIcon Margin="4,0" Height="20">
+					<UserControl.Style>
+						<Style TargetType="{x:Type UserControl}">
+							<Setter Property="Foreground" Value="{DynamicResource IconBrush}"/>
+
+							<Style.Triggers>
+								<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+									<Setter Property="Foreground" Value="{DynamicResource IconInactiveBrush}" />
+								</DataTrigger>
+							</Style.Triggers>
+						</Style>
+					</UserControl.Style>
+				</icons:VisualStudioIcon>
+
+				<Menu VerticalAlignment="Center" WindowChrome.IsHitTestVisibleInChrome="True">
+					<MenuItem Header="File">
+						<MenuItem Command="{Binding NewCommand}" Header="New" />
+						<MenuItem Command="{Binding OpenCommand}" Header="Open" />
+						<Separator />
+						<MenuItem Command="{Binding ActiveDocument.SaveCommand}" Header="Save" />
+						<MenuItem Command="{Binding ActiveDocument.SaveAsCommand}" Header="Save As..." />
+						<Separator />
+						<MenuItem Command="{Binding ActiveDocument.CloseCommand}" Header="Close" />
+					</MenuItem>
+
+					<MenuItem Header="Edit"/>
+
+					<MenuItem Header="View">
+						<MenuItem Header="SolutionExplorer" IsCheckable="True" IsChecked="{Binding Explorer.IsVisible, Mode=TwoWay}" />
+						<MenuItem Header="Properties" IsCheckable="True" IsChecked="{Binding Props.IsVisible, Mode=TwoWay}" />
+						<MenuItem Header="Error List" IsCheckable="True" IsChecked="{Binding Errors.IsVisible, Mode=TwoWay}" />
+						<MenuItem Header="Output" IsCheckable="True" IsChecked="{Binding Output.IsVisible, Mode=TwoWay}" />
+					</MenuItem>
+
+					<!--<MenuItem Header="Layout">
 					<MenuItem Command="{Binding LoadLayoutCommand, ElementName=mainWindow}" Header="Load" />
 					<MenuItem Command="{Binding SaveLayoutCommand, ElementName=mainWindow}" Header="Save" />
 					<MenuItem Click="OnDumpToConsole" Header="Dump to Console" />
 				</MenuItem>-->
-			</Menu>
-			
-			<ComboBox Margin="4,0"
+				</Menu>
+
+				<ComboBox Margin="4,0"
 				 WindowChrome.IsHitTestVisibleInChrome="True"
 				DisplayMemberPath="Item1"
 				ItemsSource="{Binding Themes}"
 				SelectedItem="{Binding SelectedTheme}" SelectedIndex="0" />
-		</StackPanel>
+
+				<Border Background="{DynamicResource ProjectNameBackground}" Padding="8,0" Margin="14,0">
+					<TextBlock Text="VS2013 Demo" VerticalAlignment="Center" Padding="0,1,0,0">
+						<TextBlock.Style>
+							<Style TargetType="TextBlock">
+								<Setter Property="Foreground" Value="{DynamicResource ProjectNameForeground}"/>
+
+								<Style.Triggers>
+									<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+										<Setter Property="Foreground" Value="{DynamicResource ProjectNameInactiveForeground}" />
+									</DataTrigger>
+								</Style.Triggers>
+							</Style>
+						</TextBlock.Style>
+					</TextBlock>
+				</Border>
+			</StackPanel>
+
+			<StackPanel Orientation="Vertical" Grid.Row="2" HorizontalAlignment="Left">
+				<Rectangle Margin="12,1" Width="5" Height="17" UseLayoutRounding="True" RenderOptions.BitmapScalingMode="NearestNeighbor">
+					<Rectangle.Fill>
+						<DrawingBrush TileMode="Tile" Viewbox="0,0,4,4" ViewboxUnits="Absolute" Viewport="0,0,4,4" ViewportUnits="Absolute">
+							<DrawingBrush.Drawing>
+								<GeometryDrawing Brush="{DynamicResource ToolBarGripper}">
+									<GeometryDrawing.Geometry>
+										<GeometryGroup>
+											<GeometryGroup.Children>
+												<RectangleGeometry Rect="0,0,1,1" />
+												<RectangleGeometry Rect="2,2,1,1" />
+											</GeometryGroup.Children>
+										</GeometryGroup>
+									</GeometryDrawing.Geometry>
+								</GeometryDrawing>
+							</DrawingBrush.Drawing>
+						</DrawingBrush>
+					</Rectangle.Fill>
+				</Rectangle>
+
+				<Rectangle Margin="12,8,12,11" Width="5" Height="17" UseLayoutRounding="True" RenderOptions.BitmapScalingMode="NearestNeighbor">
+					<Rectangle.Fill>
+						<DrawingBrush TileMode="Tile" Viewbox="0,0,4,4" ViewboxUnits="Absolute" Viewport="0,0,4,4" ViewportUnits="Absolute">
+							<DrawingBrush.Drawing>
+								<GeometryDrawing Brush="{DynamicResource ToolBarGripper}">
+									<GeometryDrawing.Geometry>
+										<GeometryGroup>
+											<GeometryGroup.Children>
+												<RectangleGeometry Rect="0,0,1,1" />
+												<RectangleGeometry Rect="2,2,1,1" />
+											</GeometryGroup.Children>
+										</GeometryGroup>
+									</GeometryDrawing.Geometry>
+								</GeometryDrawing>
+							</DrawingBrush.Drawing>
+						</DrawingBrush>
+					</Rectangle.Fill>
+				</Rectangle>
+			</StackPanel>
+
+			<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" WindowChrome.IsHitTestVisibleInChrome="True">
+				<Button Style="{StaticResource MinimizeButton}" Click="MinimizeClick" />
+				<Button Style="{StaticResource MaximizeButton}" Click="MaximizeClick" />
+				<Button Style="{StaticResource RestoreDownButton}" Click="RestoreDownClick" />
+				<Button Style="{StaticResource CloseButton}" Click="CloseClick" />
+			</StackPanel>
+		</Grid>
 
 		<DockingManager
             Grid.Row="1"
@@ -134,6 +205,16 @@
 							<Border/>
 						</DataTemplate>
 					</local:PanesTemplateSelector.OutputViewTemplate>
+					<local:PanesTemplateSelector.GitChangesViewTemplate>
+						<DataTemplate>
+							<Border/>
+						</DataTemplate>
+					</local:PanesTemplateSelector.GitChangesViewTemplate>
+					<local:PanesTemplateSelector.ToolboxViewTemplate>
+						<DataTemplate>
+							<Border/>
+						</DataTemplate>
+					</local:PanesTemplateSelector.ToolboxViewTemplate>
 				</local:PanesTemplateSelector>
 			</DockingManager.LayoutItemTemplateSelector>
 
@@ -167,34 +248,23 @@
 			</DockingManager.LayoutUpdateStrategy>
 
 			<LayoutRoot>
-				<LayoutPanel Orientation="Vertical">
-					<LayoutPanel>
-						<LayoutAnchorablePaneGroup DockWidth="256">
-							<LayoutAnchorablePane Name="ExplorerPane"/>
-						</LayoutAnchorablePaneGroup>
-
+				<LayoutPanel Orientation="Horizontal">
+					<LayoutPanel Orientation="Vertical">
 						<LayoutDocumentPane/>
 
-						<LayoutAnchorablePaneGroup DockWidth="256">
-							<LayoutAnchorablePane Name="PropertiesPane"/>
+						<LayoutAnchorablePaneGroup DockHeight="128">
+							<LayoutAnchorablePane Name="OutputPane"/>
 						</LayoutAnchorablePaneGroup>
 					</LayoutPanel>
 
-					<LayoutAnchorablePaneGroup DockHeight="128">
-						<LayoutAnchorablePane Name="ErrorPane"/>
-						<LayoutAnchorablePane Name="OutputPane"/>
+					<LayoutAnchorablePaneGroup DockWidth="256" Orientation="Vertical">
+						<LayoutAnchorablePane Name="ExplorerPane" DockHeight="2*"/>
+						<LayoutAnchorablePane Name="PropertiesPane"/>
 					</LayoutAnchorablePaneGroup>
 				</LayoutPanel>
 			</LayoutRoot>
 		</DockingManager>
 
-		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" WindowChrome.IsHitTestVisibleInChrome="True">
-			<Button Style="{StaticResource MinimizeButton}" Click="MinimizeClick" />
-			<Button Style="{StaticResource MaximizeButton}" Click="MaximizeClick" />
-			<Button Style="{StaticResource RestoreDownButton}" Click="RestoreDownClick" />
-			<Button Style="{StaticResource CloseButton}" Click="CloseClick" />
-		</StackPanel>
-
 		<Border Grid.Row="2" Height="23" Background="{DynamicResource StatusBarBackground}">
 			<Grid>
 				<StackPanel Orientation="Horizontal">

From a57c14298cad4d47fed639c5e63309504ea46e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=A2=D1=80=D1=83=D1=88=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2?= <oleg_trushkov@hotmail.com>
Date: Sat, 26 Jun 2021 18:05:46 +0300
Subject: [PATCH 7/8] Added MLib dependency. Fixed caption height.

---
 source/VS2013Test/App.xaml                    |   2 +
 source/VS2013Test/LayoutInitializer.cs        |  45 +++-----
 source/VS2013Test/PanesTemplateSelector.cs    |   9 --
 .../VS2013Test/Themes/BlueBrushsExtended.xaml |   9 +-
 .../Themes/Controls/VsResizeGrip.xaml         |  48 ++++++++
 .../VS2013Test/Themes/DarkBrushsExtended.xaml |   7 +-
 .../Themes/LightBrushsExtended.xaml           |   5 +-
 source/VS2013Test/VS2013Test.csproj           |   4 +
 .../ViewModels/FileStatsViewModel.cs          | 109 ------------------
 source/VS2013Test/ViewModels/Workspace.cs     |  22 ++--
 source/VS2013Test/Views/MainView.xaml         |  26 ++---
 source/VS2013Test/Views/MainView.xaml.cs      |  23 ++++
 12 files changed, 123 insertions(+), 186 deletions(-)
 create mode 100644 source/VS2013Test/Themes/Controls/VsResizeGrip.xaml
 delete mode 100644 source/VS2013Test/ViewModels/FileStatsViewModel.cs

diff --git a/source/VS2013Test/App.xaml b/source/VS2013Test/App.xaml
index 26b5b38b..9b1b9681 100644
--- a/source/VS2013Test/App.xaml
+++ b/source/VS2013Test/App.xaml
@@ -7,8 +7,10 @@
     <Application.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary Source="pack://application:,,,/MLib;component/Themes/DarkTheme.xaml" />
 				<ResourceDictionary Source="pack://application:,,,/VS2013Test;component/Themes/DarkBrushsExtended.xaml" />
 				<ResourceDictionary Source="pack://application:,,,/VS2013Test;component/Themes/Generic.xaml" />
+				<ResourceDictionary Source="pack://application:,,,/VS2013Test;component/Themes/Controls/VsResizeGrip.xaml" />
 
 				<ResourceDictionary>
 					<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
diff --git a/source/VS2013Test/LayoutInitializer.cs b/source/VS2013Test/LayoutInitializer.cs
index 16205735..b5d8fa48 100644
--- a/source/VS2013Test/LayoutInitializer.cs
+++ b/source/VS2013Test/LayoutInitializer.cs
@@ -12,19 +12,19 @@ public bool BeforeInsertAnchorable(LayoutRoot layout, LayoutAnchorable anchorabl
 			//just for test provide a new anchorablepane 
 			//if the pane is floating let the manager go ahead
 			LayoutAnchorablePane destPane = destinationContainer as LayoutAnchorablePane;
+			anchorableToShow.AutoHideWidth = 256;
+			anchorableToShow.AutoHideHeight = 128;
 
 			if (destinationContainer != null && destinationContainer.FindParent<LayoutFloatingWindow>() != null)
 				return false;
 
 			if (anchorableToShow.Content is ExplorerViewModel)
 			{
-				anchorableToShow.AutoHideWidth = 256;
+				var explorerPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "ExplorerPane");
 
-				var treeViewPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "ExplorerPane");
-
-				if (treeViewPane != null)
+				if (explorerPane != null)
 				{
-					treeViewPane.Children.Add(anchorableToShow);
+					explorerPane.Children.Add(anchorableToShow);
 					return true;
 				}
 			}
@@ -32,6 +32,7 @@ public bool BeforeInsertAnchorable(LayoutRoot layout, LayoutAnchorable anchorabl
 			if (anchorableToShow.Content is PropertiesViewModel)
 			{
 				var propertiesPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "PropertiesPane");
+
 				if (propertiesPane != null)
 				{
 					propertiesPane.Children.Add(anchorableToShow);
@@ -39,23 +40,8 @@ public bool BeforeInsertAnchorable(LayoutRoot layout, LayoutAnchorable anchorabl
 				}
 			}
 
-			if (anchorableToShow.Content is FileStatsViewModel)
-			{
-				anchorableToShow.AutoHideWidth = 256;
-
-				var controllerPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "FileStatsPane");
-
-				if (controllerPane != null)
-				{
-					controllerPane.Children.Add(anchorableToShow);
-					return true;
-				}
-			}
-
 			if (anchorableToShow.Content is OutputViewModel)
 			{
-				anchorableToShow.AutoHideHeight = 128;
-
 				var outputPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "OutputPane");
 
 				if (outputPane != null)
@@ -69,9 +55,6 @@ public bool BeforeInsertAnchorable(LayoutRoot layout, LayoutAnchorable anchorabl
 			{
 				var leftGroup = new LayoutAnchorGroup();
 				leftGroup.Children.Add(anchorableToShow);
-
-				anchorableToShow.AutoHideWidth = 256;
-
 				layout.LeftSide.Children.Add(leftGroup);
 				return true;
 			}
@@ -80,21 +63,23 @@ public bool BeforeInsertAnchorable(LayoutRoot layout, LayoutAnchorable anchorabl
 			{
 				var rightGroup = new LayoutAnchorGroup();
 				rightGroup.Children.Add(anchorableToShow);
-
-				anchorableToShow.AutoHideWidth = 256;
-
 				layout.RightSide.Children.Add(rightGroup);
 				return true;
 			}
 
 			if (anchorableToShow.Content is ErrorViewModel)
 			{
-				var bottomGroup = new LayoutAnchorGroup();
-				bottomGroup.Children.Add(anchorableToShow);
+				//var errorsPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "ErrorsPane");
 
-				anchorableToShow.AutoHideWidth = 256;
-				anchorableToShow.AutoHideHeight = 128;
+				//if (errorsPane != null)
+				//{
+				//	errorsPane.Children.Add(anchorableToShow);
+				//	anchorableToShow.Hide(false);
+				//	return true;
+				//}
 
+				var bottomGroup = new LayoutAnchorGroup();
+				bottomGroup.Children.Add(anchorableToShow);
 				layout.BottomSide.Children.Add(bottomGroup);
 				return true;
 			}
diff --git a/source/VS2013Test/PanesTemplateSelector.cs b/source/VS2013Test/PanesTemplateSelector.cs
index 7be3babb..baf0a821 100644
--- a/source/VS2013Test/PanesTemplateSelector.cs
+++ b/source/VS2013Test/PanesTemplateSelector.cs
@@ -17,12 +17,6 @@ public DataTemplate FileViewTemplate
 			set;
 		}
 
-		public DataTemplate FileStatsViewTemplate
-		{
-			get;
-			set;
-		}
-
 		public DataTemplate PropertiesViewTemplate
 		{
 			get;
@@ -66,9 +60,6 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
 			if (item is FileViewModel)
 				return FileViewTemplate;
 
-			if (item is FileStatsViewModel)
-				return FileStatsViewTemplate;
-
 			if (item is PropertiesViewModel)
 				return PropertiesViewTemplate;
 
diff --git a/source/VS2013Test/Themes/BlueBrushsExtended.xaml b/source/VS2013Test/Themes/BlueBrushsExtended.xaml
index e87256c6..949604b3 100644
--- a/source/VS2013Test/Themes/BlueBrushsExtended.xaml
+++ b/source/VS2013Test/Themes/BlueBrushsExtended.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"							
+					xmlns:MLib_reskeys="clr-namespace:MLib.Themes;assembly=MLib">
 
 	<SolidColorBrush x:Key="IconBrush" Color="#854CC7" />
 	<SolidColorBrush x:Key="IconInactiveBrush" Color="#98A3C6" />
@@ -15,7 +16,9 @@
 	<SolidColorBrush x:Key="WindowBorderBrush" Color="#1F3C76" />
 	<SolidColorBrush x:Key="WindowInactiveBorderBrush" Color="#515151" />
 	<SolidColorBrush x:Key="ToolBarGripper" Color="#3A4470" />
-	<SolidColorBrush x:Key="ProjectNameForeground" Color="#40508D" />
-	<SolidColorBrush x:Key="ProjectNameInactiveForeground" Color="#A3ABCA" />
+	<SolidColorBrush x:Key="ProjectNameForeground" Color="#FF40568D" />
+	<SolidColorBrush x:Key="ProjectNameInactiveForeground" Color="#664C5787" />
 	<SolidColorBrush x:Key="ProjectNameBackground" Color="#D9E0F8" />
+	<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MLib_reskeys:ResourceKeys}, ResourceId=NormalBackgroundBrushKey}" Color="Transparent" />
+	<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MLib_reskeys:ResourceKeys}, ResourceId=TopLevelHeaderMenuBackgroundKey}" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/Themes/Controls/VsResizeGrip.xaml b/source/VS2013Test/Themes/Controls/VsResizeGrip.xaml
new file mode 100644
index 00000000..65c8d750
--- /dev/null
+++ b/source/VS2013Test/Themes/Controls/VsResizeGrip.xaml
@@ -0,0 +1,48 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+					xmlns:s="clr-namespace:System;assembly=mscorlib">
+
+	<Style TargetType="ResizeGrip">
+		<Setter Property="UIElement.Focusable">
+			<Setter.Value>
+				<s:Boolean>False</s:Boolean>
+			</Setter.Value>
+		</Setter>
+		
+		<Setter Property="Control.Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ResizeGrip">
+					<Grid Background="#00FFFFFF" x:Uid="Grid_1" SnapsToDevicePixels="True">
+						<Canvas Width="8" Height="8" Margin="5,5,5,5" Opacity="0.5" x:Uid="Canvas_1">
+							<Canvas Width="7" Height="7" Margin="1,1,0,0" x:Uid="Canvas_2">
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_1" Canvas.Left="6" Canvas.Top="6" Fill="White"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_2" Canvas.Left="4" Canvas.Top="6" Fill="White"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_3" Canvas.Left="2" Canvas.Top="6" Fill="White"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_4" Canvas.Left="0" Canvas.Top="6" Fill="White"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_5" Canvas.Left="6" Canvas.Top="4" Fill="White"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_6" Canvas.Left="6" Canvas.Top="2" Fill="White"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_7" Canvas.Left="6" Canvas.Top="0" Fill="White"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_8" Canvas.Left="4" Canvas.Top="2" Fill="White"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_9" Canvas.Left="2" Canvas.Top="4" Fill="White"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_10" Canvas.Left="4" Canvas.Top="4" Fill="White"/>
+							</Canvas>
+							
+							<Canvas Width="7" Height="7" Margin="0,0,0,0" x:Uid="Canvas_3">
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_11" Canvas.Left="6" Canvas.Top="6" Fill="#7F000000"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_12" Canvas.Left="4" Canvas.Top="6" Fill="#7F000000"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_13" Canvas.Left="2" Canvas.Top="6" Fill="#7F000000"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_14" Canvas.Left="0" Canvas.Top="6" Fill="#7F000000"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_15" Canvas.Left="6" Canvas.Top="4" Fill="#7F000000"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_16" Canvas.Left="6" Canvas.Top="2" Fill="#7F000000"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_17" Canvas.Left="6" Canvas.Top="0" Fill="#7F000000"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_18" Canvas.Left="4" Canvas.Top="2" Fill="#7F000000"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_19" Canvas.Left="2" Canvas.Top="4" Fill="#7F000000"/>
+								<Rectangle Width="1" Height="1" x:Uid="Rectangle_20" Canvas.Left="4" Canvas.Top="4" Fill="#7F000000"/>
+							</Canvas>
+						</Canvas>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/Themes/DarkBrushsExtended.xaml b/source/VS2013Test/Themes/DarkBrushsExtended.xaml
index 69e58c59..20cbd19b 100644
--- a/source/VS2013Test/Themes/DarkBrushsExtended.xaml
+++ b/source/VS2013Test/Themes/DarkBrushsExtended.xaml
@@ -1,8 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"			
+					xmlns:MLib_reskeys="clr-namespace:MLib.Themes;assembly=MLib">
 
 	<SolidColorBrush x:Key="IconBrush" Color="White" />
-	<SolidColorBrush x:Key="IconInactiveBrush" Color="#818183" />
+	<SolidColorBrush x:Key="IconInactiveBrush" Color="#66FFFFFF" />
 	<SolidColorBrush x:Key="HeaderBackground" Color="#2D2D30" />
 	<SolidColorBrush x:Key="StatusBarBackground" Color="#007ACC" />
 	<SolidColorBrush x:Key="StatusBarForeground" Color="White" />
@@ -18,4 +19,6 @@
 	<SolidColorBrush x:Key="ProjectNameForeground" Color="White" />
 	<SolidColorBrush x:Key="ProjectNameInactiveForeground" Color="#818181" />
 	<SolidColorBrush x:Key="ProjectNameBackground" Color="#252526" />
+	<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MLib_reskeys:ResourceKeys}, ResourceId=NormalBackgroundBrushKey}" Color="Transparent" />
+	<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MLib_reskeys:ResourceKeys}, ResourceId=TopLevelHeaderMenuBackgroundKey}" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/Themes/LightBrushsExtended.xaml b/source/VS2013Test/Themes/LightBrushsExtended.xaml
index 27954039..72fe253f 100644
--- a/source/VS2013Test/Themes/LightBrushsExtended.xaml
+++ b/source/VS2013Test/Themes/LightBrushsExtended.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+					xmlns:MLib_reskeys="clr-namespace:MLib.Themes;assembly=MLib">
 
 	<SolidColorBrush x:Key="IconBrush" Color="#865FC5" />
 	<SolidColorBrush x:Key="IconInactiveBrush" Color="#8F8F91" />
@@ -18,4 +19,6 @@
 	<SolidColorBrush x:Key="ProjectNameForeground" Color="Black" />
 	<SolidColorBrush x:Key="ProjectNameInactiveForeground" Color="#929496" />
 	<SolidColorBrush x:Key="ProjectNameBackground" Color="#E0E3E6" />
+	<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MLib_reskeys:ResourceKeys}, ResourceId=NormalBackgroundBrushKey}" Color="Transparent" />
+	<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MLib_reskeys:ResourceKeys}, ResourceId=TopLevelHeaderMenuBackgroundKey}" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/VS2013Test.csproj b/source/VS2013Test/VS2013Test.csproj
index 1db14c16..85d50ca9 100644
--- a/source/VS2013Test/VS2013Test.csproj
+++ b/source/VS2013Test/VS2013Test.csproj
@@ -6,6 +6,10 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Dirkster.MLib" Version="1.3.1.2" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Components\AvalonDock.Themes.VS2013\AvalonDock.Themes.VS2013.csproj" />
   </ItemGroup>
diff --git a/source/VS2013Test/ViewModels/FileStatsViewModel.cs b/source/VS2013Test/ViewModels/FileStatsViewModel.cs
deleted file mode 100644
index 938aa7d0..00000000
--- a/source/VS2013Test/ViewModels/FileStatsViewModel.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.IO;
-using System.Windows.Media.Imaging;
-
-namespace AvalonDock.VS2013Test.ViewModels
-{
-	internal class FileStatsViewModel : ToolViewModel
-	{
-		#region fields
-		public const string ToolContentId = "FileStatsTool";
-		private DateTime _lastModified;
-		private long _fileSize;
-		private string _FileName;
-		private string _FilePath;
-		#endregion fields
-
-		#region constructors
-		/// <summary>
-		/// Class constructor
-		/// </summary>
-		public FileStatsViewModel()
-			: base("File Stats")
-		{
-			Workspace.This.ActiveDocumentChanged += new EventHandler(OnActiveDocumentChanged);
-			ContentId = ToolContentId;
-		}
-		#endregion constructors
-
-		#region Properties
-
-		public long FileSize
-		{
-			get => _fileSize;
-			protected set
-			{
-				if (_fileSize != value)
-				{
-					_fileSize = value;
-					RaisePropertyChanged(nameof(FileSize));
-				}
-			}
-		}
-
-		public DateTime LastModified
-		{
-			get => _lastModified;
-			protected set
-			{
-				if (_lastModified != value)
-				{
-					_lastModified = value;
-					RaisePropertyChanged(nameof(LastModified));
-				}
-			}
-		}
-
-		public string FileName
-		{
-			get => _FileName;
-			protected set
-			{
-				if (_FileName != value)
-				{
-					_FileName = value;
-					RaisePropertyChanged(nameof(FileName));
-				}
-			}
-		}
-
-		public string FilePath
-		{
-			get => _FilePath;
-			protected set
-			{
-				if (_FilePath != value)
-				{
-					_FilePath = value;
-					RaisePropertyChanged(nameof(FilePath));
-				}
-			}
-		}
-
-		#endregion Properties
-
-		#region methods
-		private void OnActiveDocumentChanged(object sender, EventArgs e)
-		{
-			if (Workspace.This.ActiveDocument != null &&
-				Workspace.This.ActiveDocument.FilePath != null &&
-				File.Exists(Workspace.This.ActiveDocument.FilePath))
-			{
-				var fi = new FileInfo(Workspace.This.ActiveDocument.FilePath);
-				FileSize = fi.Length;
-				LastModified = fi.LastWriteTime;
-				FileName = fi.Name;
-				FilePath = fi.Directory.FullName;
-			}
-			else
-			{
-				FileSize = 0;
-				LastModified = DateTime.MinValue;
-				FileName = string.Empty;
-				FilePath = string.Empty;
-			}
-		}
-		#endregion methods
-
-	}
-}
diff --git a/source/VS2013Test/ViewModels/Workspace.cs b/source/VS2013Test/ViewModels/Workspace.cs
index 48c579b8..e24418ee 100644
--- a/source/VS2013Test/ViewModels/Workspace.cs
+++ b/source/VS2013Test/ViewModels/Workspace.cs
@@ -20,7 +20,6 @@ internal class Workspace : ViewModelBase
 		private ObservableCollection<FileViewModel> _files = new ObservableCollection<FileViewModel>();
 		private ReadOnlyObservableCollection<FileViewModel> _readonyFiles;
 		private FileViewModel _activeDocument;
-		private FileStatsViewModel _fileStats;
 		private ErrorViewModel _errors;
 		private PropertiesViewModel _props;
 		private ExplorerViewModel _explorer;
@@ -71,17 +70,6 @@ public IEnumerable<ToolViewModel> Tools
 			}
 		}
 
-		public FileStatsViewModel FileStats
-		{
-			get
-			{
-				if (_fileStats == null)
-					_fileStats = new FileStatsViewModel();
-
-				return _fileStats;
-			}
-		}
-
 		public ExplorerViewModel Explorer
 		{
 			get
@@ -216,13 +204,17 @@ private void SwitchExtendedTheme()
 			switch (selectedTheme.Item1)
 			{
 				case "Vs2013DarkTheme":
-					Application.Current.Resources.MergedDictionaries[0].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/DarkBrushsExtended.xaml");
+					Application.Current.Resources.MergedDictionaries[0].Source = new Uri("pack://application:,,,/MLib;component/Themes/DarkTheme.xaml");
+					Application.Current.Resources.MergedDictionaries[1].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/DarkBrushsExtended.xaml");
 					break;
 				case "Vs2013LightTheme":
-					Application.Current.Resources.MergedDictionaries[0].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/LightBrushsExtended.xaml");
+					Application.Current.Resources.MergedDictionaries[0].Source = new Uri("pack://application:,,,/MLib;component/Themes/LightTheme.xaml");
+					Application.Current.Resources.MergedDictionaries[1].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/LightBrushsExtended.xaml");
 					break;
 				case "Vs2013BlueTheme":
-					Application.Current.Resources.MergedDictionaries[0].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/BlueBrushsExtended.xaml");
+					//TODO: Create new color resources for blue theme
+					Application.Current.Resources.MergedDictionaries[0].Source = new Uri("pack://application:,,,/MLib;component/Themes/LightTheme.xaml");
+					Application.Current.Resources.MergedDictionaries[1].Source = new Uri("pack://application:,,,/VS2013Test;component/Themes/BlueBrushsExtended.xaml");
 					break;
 				default:
 					break;
diff --git a/source/VS2013Test/Views/MainView.xaml b/source/VS2013Test/Views/MainView.xaml
index b51e430d..75b0e539 100644
--- a/source/VS2013Test/Views/MainView.xaml
+++ b/source/VS2013Test/Views/MainView.xaml
@@ -7,14 +7,14 @@
 		xmlns:viewModels="clr-namespace:AvalonDock.VS2013Test.ViewModels"
 		xmlns:icons="clr-namespace:VS2013Test.Icons"
         mc:Ignorable="d"
-        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="900" Width="1600" SnapsToDevicePixels="True" Foreground="{DynamicResource WindowForeground}" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResize">
+        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="900" Width="1600" SnapsToDevicePixels="True" Foreground="{DynamicResource WindowForeground}" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResizeWithGrip" StateChanged="WindowStateChanged">
 
 	<Window.DataContext>
 		<viewModels:Workspace/>
 	</Window.DataContext>
 
 	<WindowChrome.WindowChrome>
-		<WindowChrome CaptionHeight="{Binding ElementName=header, Path=ActualHeight}" ResizeBorderThickness="8" CornerRadius="0" GlassFrameThickness="0" NonClientFrameEdges="None" />
+		<WindowChrome x:Name="chrome" ResizeBorderThickness="8" CornerRadius="0" GlassFrameThickness="0" NonClientFrameEdges="None" />
 	</WindowChrome.WindowChrome>
 
 	<Window.Style>
@@ -46,7 +46,7 @@
 			<RowDefinition Height="Auto"/>
 		</Grid.RowDefinitions>
 
-		<Grid x:Name="header">
+		<Grid x:Name="header" SizeChanged="HeaderSizeChanged">
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto"/>
 				<RowDefinition Height="4"/>
@@ -68,7 +68,7 @@
 					</UserControl.Style>
 				</icons:VisualStudioIcon>
 
-				<Menu VerticalAlignment="Center" WindowChrome.IsHitTestVisibleInChrome="True">
+				<Menu Style="{DynamicResource MetroMenu}" VerticalAlignment="Center" WindowChrome.IsHitTestVisibleInChrome="True">
 					<MenuItem Header="File">
 						<MenuItem Command="{Binding NewCommand}" Header="New" />
 						<MenuItem Command="{Binding OpenCommand}" Header="Open" />
@@ -86,13 +86,9 @@
 						<MenuItem Header="Properties" IsCheckable="True" IsChecked="{Binding Props.IsVisible, Mode=TwoWay}" />
 						<MenuItem Header="Error List" IsCheckable="True" IsChecked="{Binding Errors.IsVisible, Mode=TwoWay}" />
 						<MenuItem Header="Output" IsCheckable="True" IsChecked="{Binding Output.IsVisible, Mode=TwoWay}" />
+						<MenuItem Header="Git Changes" IsCheckable="True" IsChecked="{Binding Git.IsVisible, Mode=TwoWay}" />
+						<MenuItem Header="Toolbox" IsCheckable="True" IsChecked="{Binding Toolbox.IsVisible, Mode=TwoWay}" />
 					</MenuItem>
-
-					<!--<MenuItem Header="Layout">
-					<MenuItem Command="{Binding LoadLayoutCommand, ElementName=mainWindow}" Header="Load" />
-					<MenuItem Command="{Binding SaveLayoutCommand, ElementName=mainWindow}" Header="Save" />
-					<MenuItem Click="OnDumpToConsole" Header="Dump to Console" />
-				</MenuItem>-->
 				</Menu>
 
 				<ComboBox Margin="4,0"
@@ -177,14 +173,9 @@
 				<local:PanesTemplateSelector>
 					<local:PanesTemplateSelector.FileViewTemplate>
 						<DataTemplate>
-							<TextBox Background="Transparent" BorderThickness="0" Text="{Binding TextContent, UpdateSourceTrigger=PropertyChanged}" />
+							<TextBox Background="Transparent" Foreground="{DynamicResource WindowForeground}" CaretBrush="{DynamicResource WindowForeground}" FontFamily="Consolas" BorderThickness="0" Padding="2,4" Text="{Binding TextContent, UpdateSourceTrigger=PropertyChanged}" AcceptsReturn="True" AcceptsTab="True" />
 						</DataTemplate>
 					</local:PanesTemplateSelector.FileViewTemplate>
-					<local:PanesTemplateSelector.FileStatsViewTemplate>
-						<DataTemplate>
-							<Border/>
-						</DataTemplate>
-					</local:PanesTemplateSelector.FileStatsViewTemplate>
 					<local:PanesTemplateSelector.PropertiesViewTemplate>
 						<DataTemplate>
 							<Border/>
@@ -252,7 +243,8 @@
 					<LayoutPanel Orientation="Vertical">
 						<LayoutDocumentPane/>
 
-						<LayoutAnchorablePaneGroup DockHeight="128">
+						<LayoutAnchorablePaneGroup DockHeight="128" Orientation="Horizontal">
+							<LayoutAnchorablePane Name="ErrorsPane"/>
 							<LayoutAnchorablePane Name="OutputPane"/>
 						</LayoutAnchorablePaneGroup>
 					</LayoutPanel>
diff --git a/source/VS2013Test/Views/MainView.xaml.cs b/source/VS2013Test/Views/MainView.xaml.cs
index 9e353ccc..aaa1696d 100644
--- a/source/VS2013Test/Views/MainView.xaml.cs
+++ b/source/VS2013Test/Views/MainView.xaml.cs
@@ -44,5 +44,28 @@ private void CloseClick(object sender, RoutedEventArgs e)
 		{
 			Close();
 		}
+
+		private void WindowStateChanged(object sender, EventArgs e)
+		{
+			SetCaptionHeight();
+		}
+
+		private void HeaderSizeChanged(object sender, SizeChangedEventArgs e)
+		{
+			SetCaptionHeight();
+		}
+
+		private void SetCaptionHeight()
+		{
+			switch (WindowState)
+			{
+				case WindowState.Normal:
+					chrome.CaptionHeight = header.ActualHeight + BorderThickness.Top - chrome.ResizeBorderThickness.Top;
+					break;
+				case WindowState.Maximized:
+					chrome.CaptionHeight = header.ActualHeight - BorderThickness.Top;
+					break;
+			}
+		}
 	}
 }

From 74aba426a60fd7fa9c9aa5401133f5ddb3bf631f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=A2=D1=80=D1=83=D1=88=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2?= <oleg_trushkov@hotmail.com>
Date: Fri, 2 Jul 2021 02:10:10 +0300
Subject: [PATCH 8/8] VS2013 theme update. Fixed interaction with document in
 VS2013Test project.

---
 .../AvalonDock.Themes.VS2013/BlueBrushs.xaml  |    2 +-
 .../AvalonDock.Themes.VS2013/DarkBrushs.xaml  |    8 +-
 .../AvalonDock.Themes.VS2013/LightBrushs.xaml |    6 +-
 .../Themes/Generic.xaml                       | 3101 +++++++++--------
 .../Themes/Icons/IconGeometry.xaml            |    6 +-
 source/VS2013Test/LayoutInitializer.cs        |   16 +-
 .../VS2013Test/Themes/BlueBrushsExtended.xaml |    1 +
 .../VS2013Test/Themes/DarkBrushsExtended.xaml |    1 +
 source/VS2013Test/Themes/Generic.xaml         |    8 +-
 .../Themes/LightBrushsExtended.xaml           |    1 +
 source/VS2013Test/ViewModels/FileViewModel.cs |    4 +-
 source/VS2013Test/ViewModels/Workspace.cs     |   20 +-
 source/VS2013Test/Views/MainView.xaml         |   51 +-
 source/VS2013Test/Views/MainView.xaml.cs      |   24 +-
 14 files changed, 1727 insertions(+), 1522 deletions(-)

diff --git a/source/Components/AvalonDock.Themes.VS2013/BlueBrushs.xaml b/source/Components/AvalonDock.Themes.VS2013/BlueBrushs.xaml
index d8a30098..81f99228 100644
--- a/source/Components/AvalonDock.Themes.VS2013/BlueBrushs.xaml
+++ b/source/Components/AvalonDock.Themes.VS2013/BlueBrushs.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
diff --git a/source/Components/AvalonDock.Themes.VS2013/DarkBrushs.xaml b/source/Components/AvalonDock.Themes.VS2013/DarkBrushs.xaml
index 8651e085..8098a79f 100644
--- a/source/Components/AvalonDock.Themes.VS2013/DarkBrushs.xaml
+++ b/source/Components/AvalonDock.Themes.VS2013/DarkBrushs.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
@@ -150,12 +150,12 @@
 	<SolidColorBrush
 		x:Key="{x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}"
 		options:Freeze="true"
-		Color="#0E6198" />
+		Color="#007ACC" />
 	<!--  AccentColor  -->
 	<SolidColorBrush
 		x:Key="{x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}"
 		options:Freeze="true"
-		Color="#0E6198" />
+		Color="#007ACC" />
 	<SolidColorBrush
 		x:Key="{x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}"
 		options:Freeze="true"
@@ -163,7 +163,7 @@
 	<SolidColorBrush
 		x:Key="{x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}"
 		options:Freeze="true"
-		Color="#6D6D70" />
+		Color="#F1F1F1" />
 	<SolidColorBrush
 		x:Key="{x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}"
 		options:Freeze="true"
diff --git a/source/Components/AvalonDock.Themes.VS2013/LightBrushs.xaml b/source/Components/AvalonDock.Themes.VS2013/LightBrushs.xaml
index 3c3d160c..705dbc96 100644
--- a/source/Components/AvalonDock.Themes.VS2013/LightBrushs.xaml
+++ b/source/Components/AvalonDock.Themes.VS2013/LightBrushs.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
@@ -147,12 +147,12 @@
 	<SolidColorBrush
 		x:Key="{x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}"
 		options:Freeze="true"
-		Color="#0E6198" />
+		Color="#007ACC" />
 	<!--  AccentColor  -->
 	<SolidColorBrush
 		x:Key="{x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}"
 		options:Freeze="true"
-		Color="#0E6198" />
+		Color="#007ACC" />
 	<SolidColorBrush
 		x:Key="{x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}"
 		options:Freeze="true"
diff --git a/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
index 83594b59..6fe0bc94 100644
--- a/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
+++ b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
@@ -18,15 +18,15 @@
 	xmlns:avalonDockProperties="clr-namespace:AvalonDock.Properties;assembly=AvalonDock"
 	xmlns:reskeys="clr-namespace:AvalonDock.Themes.VS2013.Themes"
 	xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=AvalonDock">
-	<ResourceDictionary.MergedDictionaries>
-		<ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/OverlayButtons.xaml" />
-		<ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/Themes/Menu/MenuItem.xaml" />
-		<ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/Themes/Icons/IconGeometry.xaml" />
-	</ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/OverlayButtons.xaml" />
+        <ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/Themes/Menu/MenuItem.xaml" />
+        <ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/Themes/Icons/IconGeometry.xaml" />
+    </ResourceDictionary.MergedDictionaries>
 
-	<Style x:Key="DropDownControlArea" TargetType="avalonDockControls:DropDownControlArea" />
+    <Style x:Key="DropDownControlArea" TargetType="avalonDockControls:DropDownControlArea" />
 
-	<!--
+    <!--
 	dirkster99: Removing this ToolTip style:
 	1) As it does not appear to add any additional value?
 	2) As it overwrites other Tooltip styles (eg using MLib in Edi or Aehnlich)
@@ -64,28 +64,28 @@
         </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 x:Key="AvalonDockThemeVs2013MenuItemStyle" BasedOn="{StaticResource {x:Type MenuItem}}" TargetType="{x:Type MenuItem}">
-		<Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}" />
-		<Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Template" Value="{StaticResource MLibMenuItem}" />
-	</Style>
-
-	<Style BasedOn="{StaticResource AvalonDockThemeVs2013MenuItemStyle}" TargetType="{x:Type avalonDockControls:MenuItemEx}">
-		<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 x:Key="AvalonDockThemeVs2013MenuItemStyle" BasedOn="{StaticResource {x:Type MenuItem}}" TargetType="{x:Type MenuItem}">
+        <Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}" />
+        <Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Template" Value="{StaticResource MLibMenuItem}" />
+    </Style>
+
+    <Style BasedOn="{StaticResource AvalonDockThemeVs2013MenuItemStyle}" TargetType="{x:Type avalonDockControls:MenuItemEx}">
+        <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}}" />
+        <!--
 			Retemplate ControlTemplate of MenuItem to get rid of blue'ish highlighting colors on menu item
 			https://stackoverflow.com/questions/34888636/change-background-color-of-menuitem-on-mouseover
 		-->
-	</Style>
+    </Style>
 
-	<!--
+    <!--
 	dirkster99: Removing this ContextMenu style:
 	1) As it does not appear to add any additional value?
 	2) As it overwrites other ContextMenu styles (eg using MLib in Edi or Aehnlich)
@@ -138,74 +138,75 @@
 	</Style>
 	-->
 
-	<Style BasedOn="{StaticResource {x:Type ContextMenu}}" TargetType="{x:Type avalonDockControls:ContextMenuEx}" />
-	<Style x:Key="AvalonDockThemeVs2013ToolButtonStyle" TargetType="ToggleButton">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border
+    <Style BasedOn="{StaticResource {x:Type ContextMenu}}" TargetType="{x:Type avalonDockControls:ContextMenuEx}" />
+    <Style x:Key="AvalonDockThemeVs2013ToolButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1" />
+        <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>
+                        <ContentPresenter />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
 
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<!--<Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor31}" />
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <!--<Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor31}" />
                 <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor10}" />-->
-			</Trigger>
-			<Trigger Property="IsChecked" Value="True">
-				<!--<Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor31}" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+                <!--<Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor31}" />
                 <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor10}" />-->
-			</Trigger>
-		</Style.Triggers>
-	</Style>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
 
-	<Style x:Key="AvalonDockThemeVs2013ButtonStyle" TargetType="Button">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Button">
-					<Border
+    <Style x:Key="AvalonDockThemeVs2013ButtonStyle" TargetType="Button">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1" />
+        <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>
+                        <ContentPresenter />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-	<!--  DocumentPaneControlStyle  -->
-	<Style x:Key="AvalonDockThemeVs2013DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-		<Setter Property="BorderBrush" Value="{x:Null}" />
+    <!--  DocumentPaneControlStyle  -->
+    <Style x:Key="AvalonDockThemeVs2013DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+        <Setter Property="BorderBrush" Value="{x:Null}" />
 		<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.TabBackground}}" />
 		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-					<Grid
+            <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.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <!--  Following border is required to catch mouse events  -->
+                        <Border Grid.RowSpan="2" Background="Transparent" />
 						<Grid
+							Margin="1,0"
 							Grid.Row="0"
 							Panel.ZIndex="1"
 							Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
@@ -227,8 +228,11 @@
 								KeyboardNavigation.TabIndex="1" />
 							<avalonDockControls:DropDownButton
 								x:Name="MenuDropDownButton"
+                                Width="14"
+                                Height="14"
+                                Margin="0,0,-1,5"
 								Grid.Column="1"
-								VerticalAlignment="Center"
+								VerticalAlignment="Bottom"
 								Focusable="False"
 								Style="{StaticResource AvalonDockThemeVs2013ToolButtonStyle}">
 								<avalonDockControls:DropDownButton.DropDownContextMenu>
@@ -236,8 +240,7 @@
 								</avalonDockControls:DropDownButton.DropDownContextMenu>
 								<Path
 									x:Name="MenuDropDownButtonImage"
-									Width="10"
-									Height="10"
+									Height="8"
 									HorizontalAlignment="Center"
 									VerticalAlignment="Center"
 									Data="{DynamicResource PinDocMenu}"
@@ -257,311 +260,316 @@
 							KeyboardNavigation.DirectionalNavigation="Contained"
 							KeyboardNavigation.TabIndex="2"
 							KeyboardNavigation.TabNavigation="Cycle">
-							<ContentPresenter
+                            <ContentPresenter
 								x:Name="PART_SelectedContentHost"
 								Margin="0"
 								ContentSource="SelectedContent"
 								SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</Border>
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger SourceName="MenuDropDownButton" Property="IsMouseOver" Value="True">
-							<Setter TargetName="MenuDropDownButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonHoveredBackground}}" />
-							<Setter TargetName="MenuDropDownButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonHoveredBorder}}" />
-							<Setter TargetName="MenuDropDownButtonImage" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonHoveredGlyph}}" />
-						</Trigger>
-
-						<Trigger SourceName="MenuDropDownButton" Property="IsChecked" Value="True">
-							<Setter TargetName="MenuDropDownButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonPressedBackground}}" />
-							<Setter TargetName="MenuDropDownButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonPressedBorder}}" />
-							<Setter TargetName="MenuDropDownButtonImage" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonPressedGlyph}}" />
-						</Trigger>
-
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding SelectedItem.IsActive, RelativeSource={RelativeSource Self}}" Value="False" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="BD" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveBackground}}" />
-						</MultiDataTrigger>
-
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-						</Trigger>
-
-						<DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Model.ChildrenCount}" Value="0">
-							<Setter TargetName="BD" Property="BorderBrush" Value="Transparent" />
-							<Setter TargetName="ContentPanel" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="MenuDropDownButton" Property="Visibility" Value="Collapsed" />
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger SourceName="MenuDropDownButton" Property="IsMouseOver" Value="True">
+                            <Setter TargetName="MenuDropDownButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonHoveredBackground}}" />
+                            <Setter TargetName="MenuDropDownButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonHoveredBorder}}" />
+                            <Setter TargetName="MenuDropDownButtonImage" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonHoveredGlyph}}" />
+                        </Trigger>
+
+                        <Trigger SourceName="MenuDropDownButton" Property="IsChecked" Value="True">
+                            <Setter TargetName="MenuDropDownButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonPressedBackground}}" />
+                            <Setter TargetName="MenuDropDownButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonPressedBorder}}" />
+                            <Setter TargetName="MenuDropDownButtonImage" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellOverflowButtonPressedGlyph}}" />
+                        </Trigger>
+
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding SelectedItem.IsActive, RelativeSource={RelativeSource Self}}" Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="BD" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveBackground}}" />
+                        </MultiDataTrigger>
+
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Model.ChildrenCount}" Value="0">
+                            <Setter TargetName="BD" Property="BorderBrush" Value="Transparent" />
+                            <Setter TargetName="ContentPanel" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="MenuDropDownButton" Property="Visibility" Value="Collapsed" />
+                        </DataTrigger>
+
+						<DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Model.ShowHeader}" Value="False">
+							<Setter TargetName="ContentPanel" Property="BorderThickness" Value="1" />
 						</DataTrigger>
 					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="ItemContainerStyle">
-			<Setter.Value>
-				<Style TargetType="{x:Type TabItem}">
-					<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-					<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabUnselectedBackground}}" />
-					<Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabUnselectedText}}" />
-					<Setter Property="BorderBrush" Value="Transparent" />
-					<Setter Property="ToolTip" Value="{Binding ToolTip}" />
-					<Setter Property="Padding" Value="6,1" />
-					<Setter Property="Margin" Value="0" />
-					<Setter Property="Template">
-						<Setter.Value>
-							<ControlTemplate TargetType="{x:Type TabItem}">
-								<Grid SnapsToDevicePixels="true">
-									<Border
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemContainerStyle">
+            <Setter.Value>
+                <Style TargetType="{x:Type TabItem}">
+                    <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                    <Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabUnselectedBackground}}" />
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabUnselectedText}}" />
+                    <Setter Property="BorderBrush" Value="Transparent" />
+                    <Setter Property="ToolTip" Value="{Binding ToolTip}" />
+                    <Setter Property="Padding" Value="6,1" />
+                    <Setter Property="Margin" Value="0" />
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type TabItem}">
+                                <Grid SnapsToDevicePixels="true">
+                                    <Border
 										x:Name="Bd"
 										Background="{TemplateBinding Background}"
 										BorderBrush="{Binding Background, RelativeSource={RelativeSource Self}}"
 										BorderThickness="0,0,0,2" />
-									<ContentPresenter
+                                    <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}" />
-								</Grid>
-								<ControlTemplate.Triggers>
-									<Trigger Property="Selector.IsSelected" Value="true">
-										<Setter Property="Panel.ZIndex" Value="1" />
-									</Trigger>
-
-									<!--  Document Well : Tab / Selected, active  -->
-									<DataTrigger Binding="{Binding IsActive}" Value="True">
-										<Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedActiveBackground}}" />
-										<Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedActiveText}}" />
-										<Setter Property="Panel.ZIndex" Value="1" />
-									</DataTrigger>
-
-									<!--  Document Well : Tab / Selected, inactive  -->
-									<MultiDataTrigger>
-										<MultiDataTrigger.Conditions>
-											<Condition Binding="{Binding IsActive}" Value="False" />
-											<Condition Binding="{Binding IsSelected}" Value="True" />
-										</MultiDataTrigger.Conditions>
-										<Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveBackground}}" />
-										<Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveText}}" />
-									</MultiDataTrigger>
-
-									<!--  Document Well : Tab / Unselected  -->
-									<MultiDataTrigger>
-										<MultiDataTrigger.Conditions>
-											<Condition Binding="{Binding IsActive}" Value="False" />
-											<Condition Binding="{Binding IsSelected}" Value="False" />
-										</MultiDataTrigger.Conditions>
-										<Setter TargetName="Bd" Property="BorderBrush" Value="Transparent" />
-									</MultiDataTrigger>
-
-									<!--  Document Well : Tab / Unselected, hovered  -->
-									<MultiTrigger>
-										<MultiTrigger.Conditions>
-											<Condition Property="IsMouseOver" Value="true" />
-											<Condition Property="Selector.IsSelected" Value="false" />
-										</MultiTrigger.Conditions>
-										<Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabUnselectedHoveredBackground}}" />
-										<Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabUnselectedHoveredText}}" />
-										<Setter Property="Panel.ZIndex" Value="0" />
-									</MultiTrigger>
-
-									<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>
-		<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>
+                                </Grid>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="Selector.IsSelected" Value="true">
+                                        <Setter Property="Panel.ZIndex" Value="1" />
+                                    </Trigger>
+
+                                    <!--  Document Well : Tab / Selected, active  -->
+                                    <DataTrigger Binding="{Binding IsActive}" Value="True">
+                                        <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedActiveBackground}}" />
+                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedActiveText}}" />
+                                        <Setter Property="Panel.ZIndex" Value="1" />
+                                    </DataTrigger>
+
+                                    <!--  Document Well : Tab / Selected, inactive  -->
+                                    <MultiDataTrigger>
+                                        <MultiDataTrigger.Conditions>
+                                            <Condition Binding="{Binding IsActive}" Value="False" />
+                                            <Condition Binding="{Binding IsSelected}" Value="True" />
+                                        </MultiDataTrigger.Conditions>
+                                        <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveBackground}}" />
+                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveText}}" />
+                                    </MultiDataTrigger>
+
+                                    <!--  Document Well : Tab / Unselected  -->
+                                    <MultiDataTrigger>
+                                        <MultiDataTrigger.Conditions>
+                                            <Condition Binding="{Binding IsActive}" Value="False" />
+                                            <Condition Binding="{Binding IsSelected}" Value="False" />
+                                        </MultiDataTrigger.Conditions>
+                                        <Setter TargetName="Bd" Property="BorderBrush" Value="Transparent" />
+                                    </MultiDataTrigger>
+
+                                    <!--  Document Well : Tab / Unselected, hovered  -->
+                                    <MultiTrigger>
+                                        <MultiTrigger.Conditions>
+                                            <Condition Property="IsMouseOver" Value="true" />
+                                            <Condition Property="Selector.IsSelected" Value="false" />
+                                        </MultiTrigger.Conditions>
+                                        <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabUnselectedHoveredBackground}}" />
+                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabUnselectedHoveredText}}" />
+                                        <Setter Property="Panel.ZIndex" Value="0" />
+                                    </MultiTrigger>
+
+                                    <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>
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <avalonDockControls:LayoutDocumentTabItem Model="{Binding}" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
 
-	<!--  AnchorablePaneControlStyle  -->
-	<Style x:Key="AvalonDockThemeVs2013AnchorablePaneControlStyle" 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 {x:Static reskeys:ResourceKeys.TabBackground}}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
-					<Grid
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <avalonDockControls:LayoutDocumentControl Model="{Binding}" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--  AnchorablePaneControlStyle  -->
+    <Style x:Key="AvalonDockThemeVs2013AnchorablePaneControlStyle" 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 {x:Static reskeys:ResourceKeys.TabBackground}}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+                    <Grid
 						ClipToBounds="true"
 						KeyboardNavigation.TabNavigation="Local"
 						SnapsToDevicePixels="true">
-						<Grid.RowDefinitions>
-							<RowDefinition Height="*" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-						<!--  Following border is required to catch mouse events  -->
-						<Border Grid.RowSpan="2" Background="Transparent" />
-						<Border
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <!--  Following border is required to catch mouse events  -->
+                        <Border Grid.RowSpan="2" Background="Transparent" />
+                        <Border
 							x:Name="ContentPanel"
 							Grid.Row="0"
 							Grid.Column="0"
 							Margin="0"
 							Background="{TemplateBinding Background}"
 							BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.PanelBorderBrush}}"
-							BorderThickness="1"
+							BorderThickness="0"
 							KeyboardNavigation.DirectionalNavigation="Contained"
 							KeyboardNavigation.TabIndex="2"
 							KeyboardNavigation.TabNavigation="Cycle">
-							<ContentPresenter
+                            <ContentPresenter
 								x:Name="PART_SelectedContentHost"
 								Margin="{TemplateBinding Padding}"
 								ContentSource="SelectedContent"
 								SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</Border>
-						<avalonDockControls:AnchorablePaneTabPanel
+                        </Border>
+                        <avalonDockControls:AnchorablePaneTabPanel
 							x:Name="HeaderPanel"
 							Grid.Row="1"
 							Margin="0"
 							Panel.ZIndex="1"
 							IsItemsHost="true"
 							KeyboardNavigation.TabIndex="1" />
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <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 {x:Static reskeys:ResourceKeys.ToolWindowTabUnselectedBackground}}" />
-					<Setter Property="BorderBrush" Value="Transparent" />
-					<Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabUnselectedText}}" />
-					<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-					<Setter Property="ToolTip" Value="{Binding ToolTip}" />
-					<Setter Property="Template">
-						<Setter.Value>
-							<ControlTemplate TargetType="{x:Type TabItem}">
-								<Grid SnapsToDevicePixels="true">
-									<Border
+        <Setter Property="ItemContainerStyle">
+            <Setter.Value>
+                <Style TargetType="{x:Type TabItem}">
+                    <Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabUnselectedBackground}}" />
+                    <Setter Property="BorderBrush" Value="Transparent" />
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabUnselectedText}}" />
+                    <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                    <Setter Property="ToolTip" Value="{Binding ToolTip}" />
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type TabItem}">
+                                <Grid SnapsToDevicePixels="true">
+                                    <Border
 										x:Name="SelectedBD"
 										Margin="1,-1,1,0"
 										BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabSelectedActiveBackground}}"
 										BorderThickness="0,1,0,0"
 										Visibility="Collapsed" />
-									<Border
+                                    <Border
 										x:Name="Bd"
 										Margin="0"
 										Background="{TemplateBinding Background}"
-										BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.PanelBorderBrush}}">
-										<ContentPresenter
+										BorderBrush="{TemplateBinding Background}"
+										BorderThickness="1,0,1,1">
+                                        <ContentPresenter
 											x:Name="Content"
-											Margin="6,2"
+											Margin="6,1,6,3"
 											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">
+                                    </Border>
+                                </Grid>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="Selector.IsSelected" Value="true">
 										<Setter TargetName="SelectedBD" Property="Visibility" Value="Visible" />
-										<Setter TargetName="Bd" Property="BorderThickness" Value="1,0,1,1" />
-										<Setter Property="Panel.ZIndex" Value="1" />
-									</Trigger>
-
-									<!--  Tool Window : Tab / Selected, active  -->
-									<MultiDataTrigger>
-										<MultiDataTrigger.Conditions>
-											<Condition Binding="{Binding IsSelected}" Value="True" />
-											<Condition Binding="{Binding IsActive}" Value="True" />
-										</MultiDataTrigger.Conditions>
-										<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabSelectedActiveBackground}}" />
-										<Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabSelectedActiveText}}" />
-									</MultiDataTrigger>
-
-									<!--  Tool Window : Tab / Selected, inactive  -->
-									<MultiDataTrigger>
-										<MultiDataTrigger.Conditions>
-											<Condition Binding="{Binding IsSelected}" Value="True" />
-											<Condition Binding="{Binding IsActive}" Value="False" />
-										</MultiDataTrigger.Conditions>
-										<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabSelectedInactiveBackground}}" />
-										<Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabSelectedInactiveText}}" />
-									</MultiDataTrigger>
-
-									<!--  Tool Window : Tab / Unselected, hovered  -->
-									<MultiTrigger>
-										<MultiTrigger.Conditions>
-											<Condition Property="IsMouseOver" Value="true" />
-											<Condition Property="Selector.IsSelected" Value="false" />
-										</MultiTrigger.Conditions>
-										<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabUnselectedHoveredBackground}}" />
-										<Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabUnselectedHoveredText}}" />
-										<Setter Property="Panel.ZIndex" Value="0" />
-									</MultiTrigger>
-
-									<Trigger Property="IsEnabled" Value="false">
-										<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-									</Trigger>
-								</ControlTemplate.Triggers>
-							</ControlTemplate>
-						</Setter.Value>
-					</Setter>
-					<Style.Triggers>
-						<DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TabControl}}, Path=Items.Count}" Value="1">
-							<Setter Property="Visibility" Value="Collapsed" />
-						</DataTrigger>
-					</Style.Triggers>
-				</Style>
-			</Setter.Value>
-		</Setter>
+										<Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.PanelBorderBrush}}" />
+                                        <Setter Property="Panel.ZIndex" Value="1" />
+                                    </Trigger>
+
+                                    <!--  Tool Window : Tab / Selected, active  -->
+                                    <MultiDataTrigger>
+                                        <MultiDataTrigger.Conditions>
+                                            <Condition Binding="{Binding IsSelected}" Value="True" />
+                                            <Condition Binding="{Binding IsActive}" Value="True" />
+                                        </MultiDataTrigger.Conditions>
+                                        <Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabSelectedActiveBackground}}" />
+                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabSelectedActiveText}}" />
+                                    </MultiDataTrigger>
+
+                                    <!--  Tool Window : Tab / Selected, inactive  -->
+                                    <MultiDataTrigger>
+                                        <MultiDataTrigger.Conditions>
+                                            <Condition Binding="{Binding IsSelected}" Value="True" />
+                                            <Condition Binding="{Binding IsActive}" Value="False" />
+                                        </MultiDataTrigger.Conditions>
+                                        <Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabSelectedInactiveBackground}}" />
+                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabSelectedInactiveText}}" />
+                                    </MultiDataTrigger>
+
+                                    <!--  Tool Window : Tab / Unselected, hovered  -->
+                                    <MultiTrigger>
+                                        <MultiTrigger.Conditions>
+                                            <Condition Property="IsMouseOver" Value="true" />
+                                            <Condition Property="Selector.IsSelected" Value="false" />
+                                        </MultiTrigger.Conditions>
+                                        <Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabUnselectedHoveredBackground}}" />
+                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowTabUnselectedHoveredText}}" />
+                                        <Setter Property="Panel.ZIndex" Value="0" />
+                                    </MultiTrigger>
+
+                                    <Trigger Property="IsEnabled" Value="false">
+                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TabControl}}, Path=Items.Count}" Value="1">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </Setter.Value>
+        </Setter>
 
-		<Setter Property="ItemTemplate">
-			<Setter.Value>
-				<DataTemplate>
-					<avalonDockControls:LayoutAnchorableTabItem Model="{Binding}" />
-				</DataTemplate>
-			</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>
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-	<Style TargetType="avalonDockControls:AnchorablePaneTitle">
-		<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionInactiveBackground}}" />
-		<Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionInactiveText}}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate>
-					<Border
+    <Style TargetType="avalonDockControls:AnchorablePaneTitle">
+        <Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionInactiveBackground}}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionInactiveText}}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border
 						Background="{TemplateBinding Background}"
 						BorderBrush="{TemplateBinding BorderBrush}"
 						BorderThickness="{TemplateBinding BorderThickness}">
-						<Grid Margin="2,3">
+                        <Grid Margin="2,2,3,3">
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Width="*" />
 								<ColumnDefinition Width="Auto" />
@@ -572,74 +580,81 @@
 								x:Name="DragHandleGeometryPlaceholder"
 								Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionInactiveGrip}}"
 								Visibility="Collapsed" />
-							<Rectangle
-								x:Name="DragHandleTexture"
-								Height="5"
-								Margin="8,0,4,0"
-								VerticalAlignment="Center">
-								<Rectangle.Fill>
-									<DrawingBrush
-										TileMode="Tile"
-										Viewbox="0,0,4,5"
-										ViewboxUnits="Absolute"
-										Viewport="0,0,4,5"
-										ViewportUnits="Absolute">
-										<DrawingBrush.Drawing>
-											<GeometryDrawing Brush="{Binding Fill, ElementName=DragHandleGeometryPlaceholder, Mode=OneWay, Converter={avalonDockConverters:NullToDoNothingConverter}}">
-												<GeometryDrawing.Geometry>
-													<GeometryGroup>
-														<GeometryGroup.Children>
-															<RectangleGeometry Rect="0,0,1,1" />
-															<RectangleGeometry Rect="0,4,1,1" />
-															<RectangleGeometry Rect="2,2,1,1" />
-														</GeometryGroup.Children>
-													</GeometryGroup>
-												</GeometryDrawing.Geometry>
-											</GeometryDrawing>
-										</DrawingBrush.Drawing>
-									</DrawingBrush>
-								</Rectangle.Fill>
-							</Rectangle>
-							<Border
-								Padding="5,0"
-								HorizontalAlignment="Left"
-								Background="{TemplateBinding Background}">
-								<avalonDockControls:DropDownControlArea
-									DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-									DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-									Style="{DynamicResource DropDownControlArea}">
-									<ContentPresenter
-										x:Name="Header"
-										Margin="2,0,0,0"
-										Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-										ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-										ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"
-										TextElement.Foreground="{TemplateBinding Foreground}" />
-								</avalonDockControls:DropDownControlArea>
-							</Border>
+							<DockPanel>
+								<Border
+									Padding="2,0,4,0"
+									HorizontalAlignment="Left"
+									Background="{TemplateBinding Background}">
+									<avalonDockControls:DropDownControlArea
+										DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+										DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+										Style="{DynamicResource DropDownControlArea}">
+										<ContentPresenter
+											x:Name="Header"
+											Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
+											ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+											ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"
+											TextElement.Foreground="{TemplateBinding Foreground}" />
+									</avalonDockControls:DropDownControlArea>
+								</Border>
+								<Rectangle
+									x:Name="DragHandleTexture"
+									Height="5"
+									Margin="4,0,2,0"
+									VerticalAlignment="Center"
+									UseLayoutRounding="True"
+									RenderOptions.BitmapScalingMode="NearestNeighbor">
+									<Rectangle.Fill>
+										<DrawingBrush
+											TileMode="Tile"
+											Viewbox="0,0,4,4"
+											ViewboxUnits="Absolute"
+											Viewport="0,0,4,4"
+											ViewportUnits="Absolute">
+											<DrawingBrush.Drawing>
+												<GeometryDrawing Brush="{Binding Fill, ElementName=DragHandleGeometryPlaceholder, Mode=OneWay, Converter={avalonDockConverters:NullToDoNothingConverter}}">
+													<GeometryDrawing.Geometry>
+														<GeometryGroup>
+															<GeometryGroup.Children>
+																<RectangleGeometry Rect="0,0,1,1" />
+																<RectangleGeometry Rect="2,2,1,1" />
+															</GeometryGroup.Children>
+														</GeometryGroup>
+													</GeometryDrawing.Geometry>
+												</GeometryDrawing>
+											</DrawingBrush.Drawing>
+										</DrawingBrush>
+									</Rectangle.Fill>
+								</Rectangle>
+							</DockPanel>
 							<avalonDockControls:DropDownButton
 								x:Name="MenuDropDownButton"
 								Grid.Column="1"
-								Margin="2,0"
+								Margin="1,1,1,0"
+								Width="15"
+                                Height="15"
 								VerticalAlignment="Center"
 								DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
 								DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
 								Focusable="False"
 								Style="{StaticResource AvalonDockThemeVs2013ToolButtonStyle}"
 								ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
-								<Path
+                                <Path
 									x:Name="PART_ImgMenuPin"
-									Width="10"
-									Height="13"
+									Margin="0,0,0,1"
+									Width="8"
+									Height="8"
 									Data="{DynamicResource PinMenu}"
 									Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}"
 									Stretch="Uniform" />
-							</avalonDockControls:DropDownButton>
+                            </avalonDockControls:DropDownButton>
 
 							<Button
 								x:Name="PART_AutoHidePin"
 								Grid.Column="2"
-								Margin="2,0"
+								Margin="1,1,1,0"
+								Width="15"
+                                Height="15"
 								HorizontalAlignment="Center"
 								VerticalAlignment="Center"
 								Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}"
@@ -649,8 +664,10 @@
 								Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
 								<Path
 									x:Name="PART_ImgAutoHidePin"
-									Width="10"
-									Height="13"
+									UseLayoutRounding="True"
+									RenderOptions.BitmapScalingMode="NearestNeighbor"
+									Width="11"
+									Height="11"
 									Data="{DynamicResource PinAutoHide}"
 									Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}"
 									Stretch="Uniform" />
@@ -658,7 +675,9 @@
 							<Button
 								x:Name="PART_HidePin"
 								Grid.Column="3"
-								Margin="2,0"
+								Margin="0,1,1,0"
+                                Width="15"
+                                Height="15"
 								HorizontalAlignment="Center"
 								VerticalAlignment="Center"
 								Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}"
@@ -666,210 +685,212 @@
 								Style="{StaticResource AvalonDockThemeVs2013ButtonStyle}"
 								ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
 								Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-								<Path
+                                <Path
 									x:Name="PART_ImgHidePin"
 									Width="10"
 									Height="10"
+									Margin="1,0,0,1"
 									VerticalAlignment="Center"
 									Data="{DynamicResource PinClose}"
 									Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}"
 									Stretch="Uniform" />
-							</Button>
-
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<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>
-
-						<DataTrigger Binding="{Binding Model.CanClose, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-							<Setter TargetName="PART_HidePin" Property="Command" Value="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" />
-							<Setter TargetName="PART_HidePin" Property="ToolTip" Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
-						</DataTrigger>
-
-						<!--  Tool Window : Caption / Active  -->
-						<DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-							<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionActiveBackground}}" />
-							<Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionActiveText}}" />
-							<Setter TargetName="DragHandleGeometryPlaceholder" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionActiveGrip}}" />
-						</DataTrigger>
-
-						<!--  Tool Window : Caption : Button / Active  -->
-						<DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-							<Setter TargetName="PART_ImgMenuPin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveGlyph}}" />
-							<Setter TargetName="PART_ImgAutoHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveGlyph}}" />
-							<Setter TargetName="PART_ImgHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveGlyph}}" />
-						</DataTrigger>
-
-						<!--  Tool Window : Caption : Button / Active, hovered  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseOver, ElementName=MenuDropDownButton}" Value="True" />
-								<Condition Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="MenuDropDownButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredBackground}}" />
-							<Setter TargetName="MenuDropDownButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgMenuPin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_AutoHidePin}" Value="True" />
-								<Condition Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_AutoHidePin" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredBackground}}" />
-							<Setter TargetName="PART_AutoHidePin" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgAutoHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_HidePin}" Value="True" />
-								<Condition Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_HidePin" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredBackground}}" />
-							<Setter TargetName="PART_HidePin" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Tool Window : Caption : Button / Inactive, hovered  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseOver, ElementName=MenuDropDownButton}" Value="True" />
-								<Condition Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="False" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="MenuDropDownButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredBackground}}" />
-							<Setter TargetName="MenuDropDownButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgMenuPin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_AutoHidePin}" Value="True" />
-								<Condition Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="False" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_AutoHidePin" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredBackground}}" />
-							<Setter TargetName="PART_AutoHidePin" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgAutoHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_HidePin}" Value="True" />
-								<Condition Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="False" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_HidePin" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredBackground}}" />
-							<Setter TargetName="PART_HidePin" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Tool Window : Caption : Button / Active / Inactive, pressed  -->
-						<Trigger SourceName="MenuDropDownButton" Property="IsChecked" Value="True">
-							<Setter TargetName="MenuDropDownButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedBackground}}" />
-							<Setter TargetName="MenuDropDownButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedBorder}}" />
-							<Setter TargetName="PART_ImgMenuPin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedGlyph}}" />
-						</Trigger>
-						<Trigger SourceName="PART_AutoHidePin" Property="IsMouseCaptured" Value="True">
-							<Setter TargetName="PART_AutoHidePin" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedBackground}}" />
-							<Setter TargetName="PART_AutoHidePin" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedBorder}}" />
-							<Setter TargetName="PART_ImgAutoHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedGlyph}}" />
-						</Trigger>
-						<Trigger SourceName="PART_HidePin" Property="IsMouseCaptured" Value="True">
-							<Setter TargetName="PART_HidePin" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedBackground}}" />
-							<Setter TargetName="PART_HidePin" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedBorder}}" />
-							<Setter TargetName="PART_ImgHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedGlyph}}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
+                            </Button>
 
-	<ControlTemplate x:Key="AvalonDockThemeVs2013AnchorSideTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
-		<ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
-			<ItemsControl.ItemsPanel>
-				<ItemsPanelTemplate>
-					<StackPanel
-						MinWidth="4"
-						MinHeight="4"
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <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>
+
+                        <DataTrigger Binding="{Binding Model.CanClose, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                            <Setter TargetName="PART_HidePin" Property="Command" Value="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="PART_HidePin" Property="ToolTip" Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
+                        </DataTrigger>
+
+                        <!--  Tool Window : Caption / Active  -->
+                        <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionActiveBackground}}" />
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionActiveText}}" />
+                            <Setter TargetName="DragHandleGeometryPlaceholder" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionActiveGrip}}" />
+                        </DataTrigger>
+
+                        <!--  Tool Window : Caption : Button / Active  -->
+                        <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                            <Setter TargetName="PART_ImgMenuPin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveGlyph}}" />
+                            <Setter TargetName="PART_ImgAutoHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveGlyph}}" />
+                            <Setter TargetName="PART_ImgHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveGlyph}}" />
+                        </DataTrigger>
+
+                        <!--  Tool Window : Caption : Button / Active, hovered  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, ElementName=MenuDropDownButton}" Value="True" />
+                                <Condition Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="MenuDropDownButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredBackground}}" />
+                            <Setter TargetName="MenuDropDownButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgMenuPin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_AutoHidePin}" Value="True" />
+                                <Condition Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_AutoHidePin" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredBackground}}" />
+                            <Setter TargetName="PART_AutoHidePin" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgAutoHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_HidePin}" Value="True" />
+                                <Condition Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_HidePin" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredBackground}}" />
+                            <Setter TargetName="PART_HidePin" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+
+                        <!--  Tool Window : Caption : Button / Inactive, hovered  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, ElementName=MenuDropDownButton}" Value="True" />
+                                <Condition Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="MenuDropDownButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredBackground}}" />
+                            <Setter TargetName="MenuDropDownButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgMenuPin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_AutoHidePin}" Value="True" />
+                                <Condition Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_AutoHidePin" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredBackground}}" />
+                            <Setter TargetName="PART_AutoHidePin" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgAutoHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_HidePin}" Value="True" />
+                                <Condition Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_HidePin" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredBackground}}" />
+                            <Setter TargetName="PART_HidePin" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+
+                        <!--  Tool Window : Caption : Button / Active / Inactive, pressed  -->
+                        <Trigger SourceName="MenuDropDownButton" Property="IsChecked" Value="True">
+                            <Setter TargetName="MenuDropDownButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedBackground}}" />
+                            <Setter TargetName="MenuDropDownButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgMenuPin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedGlyph}}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_AutoHidePin" Property="IsMouseCaptured" Value="True">
+                            <Setter TargetName="PART_AutoHidePin" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedBackground}}" />
+                            <Setter TargetName="PART_AutoHidePin" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgAutoHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedGlyph}}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_HidePin" Property="IsMouseCaptured" Value="True">
+                            <Setter TargetName="PART_HidePin" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedBackground}}" />
+                            <Setter TargetName="PART_HidePin" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgHidePin" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonActivePressedGlyph}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <ControlTemplate x:Key="AvalonDockThemeVs2013AnchorSideTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
+        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel
+						MinWidth="6"
+						MinHeight="6"
 						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="AvalonDockThemeVs2013AnchorGroupTemplate" 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="AvalonDockThemeVs2013AnchorTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="AvalonDockThemeVs2013AnchorGroupTemplate" 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="AvalonDockThemeVs2013AnchorTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
 		<Border
 			x:Name="Bd"
 			Margin="0,0,12,0"
-			Padding="0,3,0,3"
+			Padding="0,6,0,4"
 			Background="{DynamicResource {x:Static reskeys:ResourceKeys.AutoHideTabDefaultBackground}}"
 			BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.AutoHideTabDefaultBorder}}"
 			BorderThickness="0,0,0,6"
+			TextOptions.TextFormattingMode="Display"
 			TextElement.Foreground="{DynamicResource {x:Static reskeys:ResourceKeys.AutoHideTabDefaultText}}">
 			<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>
-		<ControlTemplate.Triggers>
-			<Trigger Property="Side" Value="Right">
-				<Setter TargetName="Bd" Property="BorderThickness" Value="0,6,0,0" />
-				<Setter TargetName="Bd" Property="Padding" Value="0,3,0,3" />
-			</Trigger>
-
-			<Trigger Property="Side" Value="Top">
-				<Setter TargetName="Bd" Property="BorderThickness" Value="0,6,0,0" />
-				<Setter TargetName="Bd" Property="Padding" Value="0,3,0,3" />
-			</Trigger>
-
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.AutoHideTabHoveredBackground}}" />
-				<Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.AutoHideTabHoveredBorder}}" />
-				<Setter TargetName="Bd" Property="TextElement.Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.AutoHideTabHoveredText}}" />
-			</Trigger>
-
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-
-	<Style x:Key="{x:Type avalonDockControls:OverlayWindow}" TargetType="{x:Type avalonDockControls:OverlayWindow}">
-		<Setter Property="UseLayoutRounding" Value="True" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
-					<Canvas x:Name="PART_DropTargetsContainer" Opacity="0.9">
-						<!--
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="Side" Value="Right">
+                <Setter TargetName="Bd" Property="BorderThickness" Value="0,6,0,0" />
+                <Setter TargetName="Bd" Property="Padding" Value="0,3,0,7" />
+            </Trigger>
+
+            <Trigger Property="Side" Value="Top">
+                <Setter TargetName="Bd" Property="BorderThickness" Value="0,6,0,0" />
+                <Setter TargetName="Bd" Property="Padding" Value="0,3,0,7" />
+            </Trigger>
+
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.AutoHideTabHoveredBackground}}" />
+                <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.AutoHideTabHoveredBorder}}" />
+                <Setter TargetName="Bd" Property="TextElement.Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.AutoHideTabHoveredText}}" />
+            </Trigger>
+
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style x:Key="{x:Type avalonDockControls:OverlayWindow}" TargetType="{x:Type avalonDockControls:OverlayWindow}">
+        <Setter Property="UseLayoutRounding" Value="True" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
+                    <Canvas x:Name="PART_DropTargetsContainer" Opacity="0.9">
+                        <!--
 							Drop target rectangle that is displayed before a document or tool window
 							is dropped into a drop target location
 						-->
-						<Path
+                        <Path
 							x:Name="PART_PreviewBox"
 							Fill="{DynamicResource {x:Static reskeys:ResourceKeys.PreviewBoxBackgroundBrushKey}}"
 							Stroke="{DynamicResource {x:Static reskeys:ResourceKeys.PreviewBoxBorderBrushKey}}"
 							StrokeThickness="0.5" />
 
-						<!--
+                        <!--
 							Outmost Outter 4 overlay buttons that are displayed at border of MainWindow
 							when user drags tool window over another tool window or document and the
 							AvalonDock air space contains additional document(s) and tool windows (s).
 						-->
-						<Grid x:Name="PART_DockingManagerDropTargets">
-							<ContentControl
+                        <Grid x:Name="PART_DockingManagerDropTargets">
+                            <ContentControl
 								x:Name="PART_DockingManagerDropTargetLeft"
 								Width="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonWidthKey}}"
 								Height="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonHeightKey}}"
@@ -882,7 +903,7 @@
 								BorderBrush="Transparent"
 								Content="{StaticResource DockAnchorableLeft}" />
 
-							<ContentControl
+                            <ContentControl
 								x:Name="PART_DockingManagerDropTargetRight"
 								Width="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonWidthKey}}"
 								Height="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonHeightKey}}"
@@ -895,7 +916,7 @@
 								BorderBrush="Transparent"
 								Content="{StaticResource DockAnchorableRight}" />
 
-							<ContentControl
+                            <ContentControl
 								x:Name="PART_DockingManagerDropTargetBottom"
 								Width="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonWidthKey}}"
 								Height="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonHeightKey}}"
@@ -908,7 +929,7 @@
 								BorderBrush="Transparent"
 								Content="{StaticResource DockAnchorableBottom}" />
 
-							<ContentControl
+                            <ContentControl
 								x:Name="PART_DockingManagerDropTargetTop"
 								Width="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonWidthKey}}"
 								Height="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonHeightKey}}"
@@ -921,34 +942,34 @@
 								BorderBrush="Transparent"
 								Content="{StaticResource DockAnchorableTop}" />
 
-						</Grid>
+                        </Grid>
 
-						<!--
+                        <!--
 							Is displayed as center cross with a max of 5 buttons when a toolwindow is
 							dragged over another tool window
 						-->
-						<Grid x:Name="PART_AnchorablePaneDropTargets">
-							<!--  Gray Star Background  -->
-							<Path
+                        <Grid x:Name="PART_AnchorablePaneDropTargets">
+                            <!--  Gray Star Background  -->
+                            <Path
 								Height="122"
 								Data="{DynamicResource DockPaneEmpty}"
 								Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
 								Stretch="Uniform"
 								Stroke="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
 								StrokeThickness="1" />
-							<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-								</Grid.ColumnDefinitions>
-								<Grid.RowDefinitions>
-									<RowDefinition />
-									<RowDefinition />
-									<RowDefinition />
-								</Grid.RowDefinitions>
-								<!--  Inner 5 buttons of star shapped control  -->
-								<ContentControl
+                            <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <!--  Inner 5 buttons of star shapped control  -->
+                                <ContentControl
 									x:Name="PART_AnchorablePaneDropTargetTop"
 									Grid.Row="0"
 									Grid.Column="1"
@@ -959,7 +980,7 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentAsAnchorableTop}" />
-								<ContentControl
+                                <ContentControl
 									x:Name="PART_AnchorablePaneDropTargetRight"
 									Grid.Row="1"
 									Grid.Column="2"
@@ -970,7 +991,7 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentAsAnchorableRight}" />
-								<ContentControl
+                                <ContentControl
 									x:Name="PART_AnchorablePaneDropTargetBottom"
 									Grid.Row="2"
 									Grid.Column="1"
@@ -981,7 +1002,7 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentAsAnchorableBottom}" />
-								<ContentControl
+                                <ContentControl
 									x:Name="PART_AnchorablePaneDropTargetLeft"
 									Grid.Row="1"
 									Grid.Column="0"
@@ -992,8 +1013,8 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentAsAnchorableLeft}" />
-								<!--  Center button of star shapped control  -->
-								<ContentControl
+                                <!--  Center button of star shapped control  -->
+                                <ContentControl
 									x:Name="PART_AnchorablePaneDropTargetInto"
 									Grid.Row="1"
 									Grid.Column="1"
@@ -1004,14 +1025,14 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentInside}" />
-							</Grid>
-						</Grid>
+                            </Grid>
+                        </Grid>
 
-						<!--  Is displayed as center cross with a max of 5 buttons when documents are dragged over the document container.  -->
-						<Grid x:Name="PART_DocumentPaneDropTargets">
+                        <!--  Is displayed as center cross with a max of 5 buttons when documents are dragged over the document container.  -->
+                        <Grid x:Name="PART_DocumentPaneDropTargets">
 
-							<!--  Gray Star Background  -->
-							<Path
+                            <!--  Gray Star Background  -->
+                            <Path
 								Height="122"
 								Data="{DynamicResource DockPaneEmpty}"
 								Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
@@ -1019,19 +1040,19 @@
 								Stroke="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
 								StrokeThickness="1" />
 
-							<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-								</Grid.ColumnDefinitions>
-								<Grid.RowDefinitions>
-									<RowDefinition />
-									<RowDefinition />
-									<RowDefinition />
-								</Grid.RowDefinitions>
-								<!--  Inner 5 buttons of star shapped control  -->
-								<ContentControl
+                            <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <!--  Inner 5 buttons of star shapped control  -->
+                                <ContentControl
 									x:Name="PART_DocumentPaneDropTargetTop"
 									Grid.Row="0"
 									Grid.Column="1"
@@ -1042,7 +1063,7 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentTop}" />
-								<ContentControl
+                                <ContentControl
 									x:Name="PART_DocumentPaneDropTargetRight"
 									Grid.Row="1"
 									Grid.Column="2"
@@ -1053,7 +1074,7 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentRight}" />
-								<ContentControl
+                                <ContentControl
 									x:Name="PART_DocumentPaneDropTargetBottom"
 									Grid.Row="2"
 									Grid.Column="1"
@@ -1064,7 +1085,7 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentBottom}" />
-								<ContentControl
+                                <ContentControl
 									x:Name="PART_DocumentPaneDropTargetLeft"
 									Grid.Row="1"
 									Grid.Column="0"
@@ -1075,8 +1096,8 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentLeft}" />
-								<!--  Center button of star shapped control  -->
-								<ContentControl
+                                <!--  Center button of star shapped control  -->
+                                <ContentControl
 									x:Name="PART_DocumentPaneDropTargetInto"
 									Grid.Row="1"
 									Grid.Column="1"
@@ -1087,37 +1108,37 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentInside}" />
-							</Grid>
-						</Grid>
+                            </Grid>
+                        </Grid>
 
-						<!--  Center star with a max of 9 buttons shown when tool window is dragged of document container  -->
-						<Grid x:Name="PART_DocumentPaneFullDropTargets">
+                        <!--  Center star with a max of 9 buttons shown when tool window is dragged of document container  -->
+                        <Grid x:Name="PART_DocumentPaneFullDropTargets">
 
-							<!--  Gray Star Background  -->
-							<Path
+                            <!--  Gray Star Background  -->
+                            <Path
 								Width="204"
 								Data="{DynamicResource DockPaneLargeEmpty}"
 								Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
 								Stretch="Uniform"
 								Stroke="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
 								StrokeThickness="1" />
-							<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-								</Grid.ColumnDefinitions>
-								<Grid.RowDefinitions>
-									<RowDefinition />
-									<RowDefinition />
-									<RowDefinition />
-									<RowDefinition />
-									<RowDefinition />
-								</Grid.RowDefinitions>
-								<!--  Inner 5 buttons of star shapped control  -->
-								<ContentControl
+                            <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <!--  Inner 5 buttons of star shapped control  -->
+                                <ContentControl
 									x:Name="PART_DocumentPaneFullDropTargetTop"
 									Grid.Row="1"
 									Grid.Column="2"
@@ -1128,7 +1149,7 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentTop}" />
-								<ContentControl
+                                <ContentControl
 									x:Name="PART_DocumentPaneFullDropTargetRight"
 									Grid.Row="2"
 									Grid.Column="3"
@@ -1139,7 +1160,7 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentRight}" />
-								<ContentControl
+                                <ContentControl
 									x:Name="PART_DocumentPaneFullDropTargetBottom"
 									Grid.Row="3"
 									Grid.Column="2"
@@ -1150,7 +1171,7 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentBottom}" />
-								<ContentControl
+                                <ContentControl
 									x:Name="PART_DocumentPaneFullDropTargetLeft"
 									Grid.Row="2"
 									Grid.Column="1"
@@ -1161,8 +1182,8 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentLeft}" />
-								<!--  Center button of star shapped control  -->
-								<ContentControl
+                                <!--  Center button of star shapped control  -->
+                                <ContentControl
 									x:Name="PART_DocumentPaneFullDropTargetInto"
 									Grid.Row="2"
 									Grid.Column="2"
@@ -1174,8 +1195,8 @@
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentInside}" />
 
-								<!--  Outer 4 buttons of star shapped control  -->
-								<ContentControl
+                                <!--  Outer 4 buttons of star shapped control  -->
+                                <ContentControl
 									x:Name="PART_DocumentPaneDropTargetTopAsAnchorablePane"
 									Grid.Row="0"
 									Grid.Column="2"
@@ -1186,7 +1207,7 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentAsAnchorableTop}" />
-								<ContentControl
+                                <ContentControl
 									x:Name="PART_DocumentPaneDropTargetRightAsAnchorablePane"
 									Grid.Row="2"
 									Grid.Column="4"
@@ -1197,7 +1218,7 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentAsAnchorableRight}" />
-								<ContentControl
+                                <ContentControl
 									x:Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane"
 									Grid.Row="4"
 									Grid.Column="2"
@@ -1208,7 +1229,7 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentAsAnchorableBottom}" />
-								<ContentControl
+                                <ContentControl
 									x:Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane"
 									Grid.Row="2"
 									Grid.Column="0"
@@ -1219,182 +1240,236 @@
 									Background="Transparent"
 									BorderBrush="Transparent"
 									Content="{StaticResource DockDocumentAsAnchorableLeft}" />
-							</Grid>
-						</Grid>
-					</Canvas>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
+                            </Grid>
+                        </Grid>
+                    </Canvas>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-	<DataTemplate x:Key="AvalonDockThemeVs2013DocumentHeaderTemplate">
-		<TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
-	</DataTemplate>
+    <DataTemplate x:Key="AvalonDockThemeVs2013DocumentHeaderTemplate">
+        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
+    </DataTemplate>
 
-	<DataTemplate x:Key="AvalonDockThemeVs2013AnchorableHeaderTemplate">
-		<TextBlock
-			Margin="5,0"
+    <DataTemplate x:Key="AvalonDockThemeVs2013AnchorableHeaderTemplate">
+        <TextBlock
 			Text="{Binding Title}"
 			TextTrimming="CharacterEllipsis" />
-	</DataTemplate>
+    </DataTemplate>
 
-	<DataTemplate x:Key="AvalonDockThemeVs2013DocumentTitleTemplate">
-		<TextBlock
+    <DataTemplate x:Key="AvalonDockThemeVs2013DocumentTitleTemplate">
+        <TextBlock
 			VerticalAlignment="Center"
 			Text="{Binding Title}"
 			TextTrimming="CharacterEllipsis" />
-	</DataTemplate>
+    </DataTemplate>
 
-	<DataTemplate x:Key="AvalonDockThemeVs2013AnchorableTitleTemplate">
-		<TextBlock
+    <DataTemplate x:Key="AvalonDockThemeVs2013AnchorableTitleTemplate">
+        <TextBlock
 			VerticalAlignment="Center"
 			Text="{Binding Title}"
 			TextTrimming="CharacterEllipsis" />
-	</DataTemplate>
-
-	<DataTemplate x:Key="AvalonDockThemeVs2013IconContentTemplate">
-		<Image Source="{Binding IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}" Stretch="Uniform" />
-	</DataTemplate>
-
-	<ContextMenu x:Key="AvalonDockThemeVs2013AnchorableContextMenu">
-		<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
+    </DataTemplate>
+
+    <DataTemplate x:Key="AvalonDockThemeVs2013IconContentTemplate">
+        <Image Source="{Binding IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}" Stretch="Uniform" />
+    </DataTemplate>
+
+    <ContextMenu x:Key="AvalonDockThemeVs2013AnchorableContextMenu">
+        <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=HideCommand}"
 			Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}"
 			Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}" />
-	</ContextMenu>
+    </ContextMenu>
 
-	<ContextMenu x:Key="AvalonDockThemeVs2013DocumentContextMenu">
-		<MenuItem
+    <ContextMenu x:Key="AvalonDockThemeVs2013DocumentContextMenu">
+        <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=CloseAllCommand}" Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}" />
-		<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
+        <MenuItem Command="{Binding Path=CloseAllButThisCommand}" Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" />
+        <MenuItem Command="{Binding Path=CloseAllCommand}" Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}" />
+        <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>
-				<Path
+            <MenuItem.Icon>
+                <Path
 					Width="14"
 					Height="14"
 					VerticalAlignment="Center"
 					Data="{DynamicResource HTabGroup}"
 					Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}"
 					Stretch="Uniform" />
-			</MenuItem.Icon>
-		</MenuItem>
+            </MenuItem.Icon>
+        </MenuItem>
 
-		<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>
-				<Path
+            <MenuItem.Icon>
+                <Path
 					Width="14"
 					Height="14"
 					VerticalAlignment="Center"
 					Data="{DynamicResource VTabGroup}"
 					Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}"
 					Stretch="Uniform" />
-			</MenuItem.Icon>
-		</MenuItem>
-		<MenuItem
+            </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
+        <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>
+    </ContextMenu>
 
-	<!--  DockingManager  -->
-	<Style x:Key="{x:Type avalonDock:DockingManager}" TargetType="{x:Type avalonDock:DockingManager}">
-		<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.Background}}" />
-		<Setter Property="DocumentPaneControlStyle" Value="{StaticResource AvalonDockThemeVs2013DocumentPaneControlStyle}" />
-		<Setter Property="AnchorablePaneControlStyle" Value="{StaticResource AvalonDockThemeVs2013AnchorablePaneControlStyle}" />
-		<Setter Property="AnchorSideTemplate" Value="{StaticResource AvalonDockThemeVs2013AnchorSideTemplate}" />
-		<Setter Property="AnchorGroupTemplate" Value="{StaticResource AvalonDockThemeVs2013AnchorGroupTemplate}" />
-		<Setter Property="AnchorTemplate" Value="{StaticResource AvalonDockThemeVs2013AnchorTemplate}" />
-		<Setter Property="DocumentHeaderTemplate" Value="{StaticResource AvalonDockThemeVs2013DocumentHeaderTemplate}" />
-		<Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AvalonDockThemeVs2013AnchorableHeaderTemplate}" />
-		<Setter Property="DocumentTitleTemplate" Value="{StaticResource AvalonDockThemeVs2013DocumentTitleTemplate}" />
-		<Setter Property="AnchorableTitleTemplate" Value="{StaticResource AvalonDockThemeVs2013AnchorableTitleTemplate}" />
-		<Setter Property="AnchorableContextMenu" Value="{StaticResource AvalonDockThemeVs2013AnchorableContextMenu}" />
-		<Setter Property="DocumentContextMenu" Value="{StaticResource AvalonDockThemeVs2013DocumentContextMenu}" />
-		<Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource AvalonDockThemeVs2013DocumentHeaderTemplate}" />
-		<Setter Property="IconContentTemplate" Value="{StaticResource AvalonDockThemeVs2013IconContentTemplate}" />
-		<Setter Property="GridSplitterWidth" Value="6" />
+    <!--  DockingManager  -->
+    <Style x:Key="{x:Type avalonDock:DockingManager}" TargetType="{x:Type avalonDock:DockingManager}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.Background}}" />
+        <Setter Property="DocumentPaneControlStyle" Value="{StaticResource AvalonDockThemeVs2013DocumentPaneControlStyle}" />
+        <Setter Property="AnchorablePaneControlStyle" Value="{StaticResource AvalonDockThemeVs2013AnchorablePaneControlStyle}" />
+        <Setter Property="AnchorSideTemplate" Value="{StaticResource AvalonDockThemeVs2013AnchorSideTemplate}" />
+        <Setter Property="AnchorGroupTemplate" Value="{StaticResource AvalonDockThemeVs2013AnchorGroupTemplate}" />
+        <Setter Property="AnchorTemplate" Value="{StaticResource AvalonDockThemeVs2013AnchorTemplate}" />
+        <Setter Property="DocumentHeaderTemplate" Value="{StaticResource AvalonDockThemeVs2013DocumentHeaderTemplate}" />
+        <Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AvalonDockThemeVs2013AnchorableHeaderTemplate}" />
+        <Setter Property="DocumentTitleTemplate" Value="{StaticResource AvalonDockThemeVs2013DocumentTitleTemplate}" />
+        <Setter Property="AnchorableTitleTemplate" Value="{StaticResource AvalonDockThemeVs2013AnchorableTitleTemplate}" />
+        <Setter Property="AnchorableContextMenu" Value="{StaticResource AvalonDockThemeVs2013AnchorableContextMenu}" />
+        <Setter Property="DocumentContextMenu" Value="{StaticResource AvalonDockThemeVs2013DocumentContextMenu}" />
+        <Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource AvalonDockThemeVs2013DocumentHeaderTemplate}" />
+        <Setter Property="IconContentTemplate" Value="{StaticResource AvalonDockThemeVs2013IconContentTemplate}" />
+        <Setter Property="GridSplitterWidth" Value="6" />
 		<Setter Property="GridSplitterHeight" Value="6" />
-	</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="Transparent" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-	<Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
 		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
-					<Border
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
+                    <Border
 						Background="{TemplateBinding Background}"
 						BorderBrush="{TemplateBinding BorderBrush}"
 						BorderThickness="{TemplateBinding BorderThickness}">
-						<ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
+                        <Grid FlowDirection="LeftToRight">
+                            <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>
 
-	<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}}"
+    <!--  LayoutGridResizerControl  -->
+    <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}" TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.Background}}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+                    <Border Background="{DynamicResource {x:Static reskeys:ResourceKeys.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}}" />
+                    </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}}"
 						Style="{DynamicResource DropDownControlArea}">
-						<Border
-							Margin="0,3,0,3"
+                        <Border
+							x:Name="Header"
+							Margin="0,0,0,2"
+							Padding="1,0"
+							Height="19"
 							Background="{TemplateBinding Background}"
-							BorderBrush="{TemplateBinding BorderBrush}"
-							BorderThickness="{TemplateBinding BorderThickness}">
-							<Grid>
+							BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.Background}}"
+							BorderThickness="0,0,0,1">
+                            <Grid>
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="*" />
 									<ColumnDefinition Width="Auto" />
 								</Grid.ColumnDefinitions>
 								<Border Grid.ColumnSpan="2" Background="Transparent" />
 								<ContentPresenter
-									Margin="4,0"
+									Margin="4,0,4,1"
+									VerticalAlignment="Bottom"
 									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}}"
 									TextBlock.Foreground="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=TabItem}}" />
-								<!--  Close button should be moved out to the container style  -->
+                                <!--  Close button should be moved out to the container style  -->
 								<Button
 									x:Name="DocumentCloseButton"
 									Grid.Column="1"
 									Width="15"
+                                    Height="15"
 									Margin="3,0"
 									HorizontalAlignment="Center"
-									VerticalAlignment="Center"
+									VerticalAlignment="Bottom"
 									Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
 									Style="{StaticResource AvalonDockThemeVs2013ButtonStyle}"
 									ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
@@ -1403,105 +1478,118 @@
 										x:Name="PART_ImgPinClose"
 										Width="10"
 										Height="10"
+										Margin="1,0,0,1"
 										VerticalAlignment="Center"
 										Data="{DynamicResource PinClose}"
 										Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionActiveText}}"
 										Stretch="Uniform" />
 								</Button>
 							</Grid>
-						</Border>
-					</avalonDockControls:DropDownControlArea>
-					<ControlTemplate.Triggers>
-						<!--  Close button visibility  -->
-						<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=IsLastFocusedDocument}" Value="true">
-							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
-						</DataTrigger>
-						<DataTrigger Binding="{Binding Path=IsActive}" Value="true">
-							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
-						</DataTrigger>
-						<!--BD: 17.08.2020 use HideCommand if CanClose=false but CanHide=true-->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-							<Condition Binding="{Binding Path=CanClose}" Value="false" />
-								<Condition Binding="{Binding Path=CanHide}" Value="true" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="DocumentCloseButton" Property="Command" Value="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" />
-							<Setter TargetName="DocumentCloseButton" Property="ToolTip" Value="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" />
-						</MultiDataTrigger>
-						<!--BD: 17.08.2020 hide button if both CanClose=false and CanHide=false-->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding Path=CanClose}" Value="false" />
-								<Condition Binding="{Binding Path=CanHide}" Value="false" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Collapsed" />
-						</MultiDataTrigger>
+                        </Border>
+                    </avalonDockControls:DropDownControlArea>
+                    <ControlTemplate.Triggers>
+                        <!--  Close button visibility  -->
+                        <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=IsLastFocusedDocument}" Value="true">
+                            <Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Path=IsActive}" Value="true">
+                            <Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Visible" />
+                        </DataTrigger>
+                        <!--BD: 17.08.2020 use HideCommand if CanClose=false but CanHide=true-->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=CanClose}" Value="false" />
+                                <Condition Binding="{Binding Path=CanHide}" Value="true" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="DocumentCloseButton" Property="Command" Value="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="DocumentCloseButton" Property="ToolTip" Value="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" />
+                        </MultiDataTrigger>
+                        <!--BD: 17.08.2020 hide button if both CanClose=false and CanHide=false-->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=CanClose}" Value="false" />
+                                <Condition Binding="{Binding Path=CanHide}" Value="false" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="DocumentCloseButton" Property="Visibility" Value="Collapsed" />
+                        </MultiDataTrigger>
 
 						<!--  Document Well : Tab : Button / Selected, inactive  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsLastFocusedDocument}" Value="true" />
-							</MultiDataTrigger.Conditions>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsLastFocusedDocument}" Value="true" />
+                            </MultiDataTrigger.Conditions>
+							<Setter TargetName="Header" Property="BorderThickness" Value="0" />
+							<Setter TargetName="Header" Property="Padding" Value="0" />
 							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}" />
 						</MultiDataTrigger>
 
 						<!--  Document Well : Tab : Button / Selected, inactive, hovered  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsLastFocusedDocument}" Value="true" />
-								<Condition Binding="{Binding IsMouseOver, ElementName=DocumentCloseButton}" Value="True" />
-							</MultiDataTrigger.Conditions>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsLastFocusedDocument}" Value="true" />
+                                <Condition Binding="{Binding IsMouseOver, ElementName=DocumentCloseButton}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+							<Setter TargetName="Header" Property="BorderThickness" Value="0" />
+							<Setter TargetName="Header" Property="Padding" Value="0" />
 							<Setter TargetName="DocumentCloseButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
-							<Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Document Well : Tab : Button / Selected, inactive, pressed  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsLastFocusedDocument}" Value="true" />
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=DocumentCloseButton}" Value="True" />
-							</MultiDataTrigger.Conditions>
+                            <Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+
+                        <!--  Document Well : Tab : Button / Selected, inactive, pressed  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsLastFocusedDocument}" Value="true" />
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=DocumentCloseButton}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+							<Setter TargetName="Header" Property="BorderThickness" Value="0" />
+							<Setter TargetName="Header" Property="Padding" Value="0" />
 							<Setter TargetName="DocumentCloseButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
-							<Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Document Well : Tab : Button / Selected, active  -->
-						<DataTrigger Binding="{Binding IsActive}" Value="true">
+                            <Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
+                        </MultiDataTrigger>
+
+                        <!--  Document Well : Tab : Button / Selected, active  -->
+                        <DataTrigger Binding="{Binding IsActive}" Value="true">
+							<Setter TargetName="Header" Property="BorderThickness" Value="0" />
+							<Setter TargetName="Header" Property="Padding" Value="0" />
 							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
-						</DataTrigger>
-
-						<!--  Document Well : Tab : Button / Selected, active, hovered  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseOver, ElementName=DocumentCloseButton}" Value="True" />
-							</MultiDataTrigger.Conditions>
+                        </DataTrigger>
+
+                        <!--  Document Well : Tab : Button / Selected, active, hovered  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseOver, ElementName=DocumentCloseButton}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+							<Setter TargetName="Header" Property="BorderThickness" Value="0" />
+							<Setter TargetName="Header" Property="Padding" Value="0" />
 							<Setter TargetName="DocumentCloseButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
-							<Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Document Well : Tab : Button / Selected, active, pressed  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=DocumentCloseButton}" Value="True" />
-							</MultiDataTrigger.Conditions>
+                            <Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+
+                        <!--  Document Well : Tab : Button / Selected, active, pressed  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=DocumentCloseButton}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+							<Setter TargetName="Header" Property="BorderThickness" Value="0" />
+							<Setter TargetName="Header" Property="Padding" Value="0" />
 							<Setter TargetName="DocumentCloseButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
-							<Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
-						</MultiDataTrigger>
+                            <Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
+                        </MultiDataTrigger>
 
-						<!--  Document Well : Tab : Button / Unselected, tab hovered  -->
-						<MultiDataTrigger>
+                        <!--  Document Well : Tab : Button / Unselected, tab hovered  -->
+                        <MultiDataTrigger>
 							<MultiDataTrigger.Conditions>
 								<Condition Binding="{Binding IsActive}" Value="False" />
 								<Condition Binding="{Binding IsLastFocusedDocument}" Value="False" />
@@ -1510,8 +1598,8 @@
 							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonUnselectedTabHoveredGlyph}}" />
 						</MultiDataTrigger>
 
-						<!--  Document Well : Tab : Button / Unselected, tab hovered, button hovered  -->
-						<MultiDataTrigger>
+                        <!--  Document Well : Tab : Button / Unselected, tab hovered, button hovered  -->
+                        <MultiDataTrigger>
 							<MultiDataTrigger.Conditions>
 								<Condition Binding="{Binding IsActive}" Value="False" />
 								<Condition Binding="{Binding IsLastFocusedDocument}" Value="False" />
@@ -1519,12 +1607,12 @@
 								<Condition Binding="{Binding IsMouseOver, ElementName=DocumentCloseButton}" Value="True" />
 							</MultiDataTrigger.Conditions>
 							<Setter TargetName="DocumentCloseButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonUnselectedTabHoveredButtonHoveredBackground}}" />
-							<Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonUnselectedTabHoveredButtonHoveredBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonUnselectedTabHoveredButtonHoveredGlyph}}" />
-						</MultiDataTrigger>
+                            <Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonUnselectedTabHoveredButtonHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonUnselectedTabHoveredButtonHoveredGlyph}}" />
+                        </MultiDataTrigger>
 
-						<!--  Document Well : Tab : Button / Unselected, tab hovered, button pressed  -->
-						<MultiDataTrigger>
+                        <!--  Document Well : Tab : Button / Unselected, tab hovered, button pressed  -->
+                        <MultiDataTrigger>
 							<MultiDataTrigger.Conditions>
 								<Condition Binding="{Binding IsActive}" Value="False" />
 								<Condition Binding="{Binding IsLastFocusedDocument}" Value="False" />
@@ -1532,83 +1620,122 @@
 								<Condition Binding="{Binding IsMouseCaptured, ElementName=DocumentCloseButton}" Value="True" />
 							</MultiDataTrigger.Conditions>
 							<Setter TargetName="DocumentCloseButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonUnselectedTabHoveredButtonPressedBackground}}" />
-							<Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonUnselectedTabHoveredButtonPressedBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonUnselectedTabHoveredButtonPressedGlyph}}" />
+                            <Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonUnselectedTabHoveredButtonPressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonUnselectedTabHoveredButtonPressedGlyph}}" />
+                        </MultiDataTrigger>
+
+						<!--  Mulitple Document Well : Tab : Button / Selected, tab hovered, button pressed  -->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=IsActive}" Value="False" />
+								<Condition Binding="{Binding Path=IsSelected}" Value="True" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="Header" Property="BorderThickness" Value="0" />
+							<Setter TargetName="Header" Property="Padding" Value="0" />
+							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
+						</MultiDataTrigger>
+
+						<!--  Mulitple Document Well : Tab : Button / Selected, inactive, hovered  -->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=IsActive}" Value="False" />
+								<Condition Binding="{Binding Path=IsSelected}" Value="True" />
+								<Condition Binding="{Binding IsMouseOver, ElementName=DocumentCloseButton}" Value="True" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="Header" Property="BorderThickness" Value="0" />
+							<Setter TargetName="Header" Property="Padding" Value="0" />
+							<Setter TargetName="DocumentCloseButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
+							<Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
+							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
+						</MultiDataTrigger>
+
+						<!--  Mulitple Document Well : Tab : Button / Selected, inactive, pressed  -->
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding Path=IsActive}" Value="False" />
+								<Condition Binding="{Binding Path=IsSelected}" Value="True" />
+								<Condition Binding="{Binding IsMouseCaptured, ElementName=DocumentCloseButton}" Value="True" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="Header" Property="BorderThickness" Value="0" />
+							<Setter TargetName="Header" Property="Padding" Value="0" />
+							<Setter TargetName="DocumentCloseButton" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
+							<Setter TargetName="DocumentCloseButton" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
+							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
 						</MultiDataTrigger>
 					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-	<Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
-					<avalonDockControls:DropDownControlArea
+    <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}}"
 						Style="{DynamicResource DropDownControlArea}">
-						<Border
+                        <Border
 							Background="{TemplateBinding Background}"
 							BorderBrush="{TemplateBinding BorderBrush}"
 							BorderThickness="{TemplateBinding BorderThickness}">
-							<Grid>
-								<ContentPresenter
+                            <Grid>
+                                <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
+                                <avalonDockControls:DropDownControlArea
 									Grid.Column="0"
 									DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
 									DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}" />
-							</Grid>
-						</Border>
-					</avalonDockControls:DropDownControlArea>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
+                            </Grid>
+                        </Border>
+                    </avalonDockControls:DropDownControlArea>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-	<Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+    <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}">
+                        Background="{TemplateBinding Background}"
+						BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.PanelBorderBrush}}"
+						BorderThickness="1,0,1,1">
 						<Grid>
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="*" />
-							</Grid.RowDefinitions>
-							<Border x:Name="Header">
-								<avalonDockControls:AnchorablePaneTitle Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" />
-							</Border>
-							<!--
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <Border x:Name="Header">
+                                <avalonDockControls:AnchorablePaneTitle Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" />
+                            </Border>
+                            <!--
 								Added ContentTemplate and ContentTemplateSelector
 								https://github.com/xceedsoftware/wpftoolkit/issues/1525
 							-->
-							<ContentPresenter
+                            <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}" />
 
-							<!--
+                            <!--
                                 <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>
-						<!--
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <!--
 							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
@@ -1621,73 +1748,101 @@
 							<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>
+					
+						<!-- Correct BorderThickness for all types of layouts LayoutAnchorableControls -->					
+						<MultiDataTrigger>
 							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model}" Value="{x:Null}" />
+								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.IsFloating}" Value="False" />		
 							</MultiDataTrigger.Conditions>
-							<Setter TargetName="Header" Property="Visibility" Value="Collapsed" />
+							<Setter TargetName="Bd" Property="BorderThickness" Value="1"/>
+						</MultiDataTrigger>
+
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.Parent.IsDirectlyHostedInFloatingWindow}" Value="False" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="Bd" Property="BorderThickness" Value="1"/>
+						</MultiDataTrigger>
+
+						<MultiDataTrigger>
+							<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" />
+								<Condition Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TabControl}}, Path=Items.Count}" Value="1" />
+							</MultiDataTrigger.Conditions>
+							<Setter TargetName="Bd" Property="BorderThickness" Value="0"/>
 						</MultiDataTrigger>
 					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-	<Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+    <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
 		<Setter Property="UseLayoutRounding" Value="True" />
 		<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.FloatingDocumentWindowBackground}}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.FloatingDocumentWindowBorder}}" />
-		<Setter Property="shell:WindowChrome.WindowChrome">
-			<Setter.Value>
-				<shell:WindowChrome
-					CaptionHeight="24"
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.FloatingDocumentWindowBorder}}" />
+        <Setter Property="shell:WindowChrome.WindowChrome">
+            <Setter.Value>
+                <shell:WindowChrome
+					CaptionHeight="32"
 					CornerRadius="0"
 					GlassFrameThickness="0"
 					ResizeBorderThickness="10"
 					ShowSystemMenu="False" />
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
-					<Grid>
-						<Border
+            </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>
-								<Grid.RowDefinitions>
-									<RowDefinition Height="Auto" MinHeight="24" />
-									<!--  https://github.com/xceedsoftware/wpftoolkit/issues/1203  -->
+                            <Grid>
+                                <Grid.RowDefinitions>
+									<RowDefinition Height="Auto" MinHeight="32" />
+                                    <!--  https://github.com/xceedsoftware/wpftoolkit/issues/1203  -->
+									<RowDefinition x:Name="MaximizedAddBorder" Height="0" />
 									<RowDefinition Height="*" />
-								</Grid.RowDefinitions>
+                                </Grid.RowDefinitions>
 
-								<Border
+                                <Border
 									x:Name="Header"
-									Padding="2,0,2,0"
-									Background="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveBackground}}"
+									Padding="0,0,0,0"
+									Background="Transparent"
 									TextElement.Foreground="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveText}}">
-									<Grid UseLayoutRounding="True">
-										<Grid.ColumnDefinitions>
-											<ColumnDefinition Width="*" />
-											<ColumnDefinition Width="Auto" />
+                                    <Grid UseLayoutRounding="True">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
 											<ColumnDefinition Width="Auto" />
 										</Grid.ColumnDefinitions>
-										<ContentPresenter
+                                        <ContentPresenter
+											TextElement.Foreground="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveText}}"
+											x:Name="HeaderContent"
+                                            Margin="12,4,12,0"
 											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
+                                        <Button
 											x:Name="PART_PinMaximize"
 											Grid.Column="1"
-											Margin="5,0"
-											HorizontalAlignment="Center"
-											VerticalAlignment="Center"
+                                            Width="34"
+											Height="26"
+											VerticalAlignment="Top"
 											shell:WindowChrome.IsHitTestVisibleInChrome="True"
 											Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
 											CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
@@ -1695,22 +1850,23 @@
 											Style="{StaticResource AvalonDockThemeVs2013ButtonStyle}"
 											ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
 											Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:InverseBoolToVisibilityConverter}}">
-											<Path
+                                            <Path
 												x:Name="PART_ImgPinMaximize"
-												Width="12"
-												Height="12"
+												Width="9"
+												Height="9"
+												RenderOptions.EdgeMode="Aliased"
 												VerticalAlignment="Center"
 												Data="{DynamicResource PinMaximize}"
 												Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}"
 												Stretch="Uniform" />
-										</Button>
+                                        </Button>
 
-										<Button
+                                        <Button
 											x:Name="PART_PinRestore"
 											Grid.Column="1"
-											Margin="5,0"
-											HorizontalAlignment="Center"
-											VerticalAlignment="Center"
+                                            Width="34"
+											Height="26"
+                                            VerticalAlignment="Top"
 											shell:WindowChrome.IsHitTestVisibleInChrome="True"
 											Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
 											CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
@@ -1718,115 +1874,118 @@
 											Style="{StaticResource AvalonDockThemeVs2013ButtonStyle}"
 											ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
 											Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-											<Path
+                                            <Path
 												x:Name="PART_ImgPinRestore"
-												Width="13"
-												Height="13"
+												Width="10"
+												Height="10"
 												VerticalAlignment="Center"
 												Data="{DynamicResource PinRestore}"
 												Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}"
 												Stretch="Uniform" />
-										</Button>
+                                        </Button>
 
-										<Button
+                                        <Button
 											x:Name="PART_PinClose"
 											Grid.Column="2"
-											HorizontalAlignment="Center"
-											VerticalAlignment="Center"
+                                            Width="34"
+											Height="26"
+											VerticalAlignment="Top"
 											shell:WindowChrome.IsHitTestVisibleInChrome="True"
 											Command="{Binding Path=CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
 											Focusable="False"
 											Style="{StaticResource AvalonDockThemeVs2013ButtonStyle}"
 											ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
 											Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-											<Path
+                                            <Path
 												x:Name="PART_ImgPinClose"
-												Width="12"
-												Height="12"
+												Width="10"
+												Height="10"
 												VerticalAlignment="Center"
 												Data="{DynamicResource PinClose}"
 												Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}"
 												Stretch="Uniform" />
-										</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)  -->
+                                        </Button>
+                                    </Grid>
+                                </Border>
+                                <ContentPresenter Grid.Row="2" Margin="6" 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" />
+							<Setter TargetName="WindowBorder" Property="Padding" Value="7" />
+							<Setter TargetName="MaximizedAddBorder" Property="Height" Value="4" />
 						</Trigger>
 						<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="True">
-							<Setter TargetName="Header" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedActiveBackground}}" />
+                            <!--<Setter TargetName="Header" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedActiveBackground}}" />-->
 							<Setter TargetName="Header" Property="TextElement.Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedActiveText}}" />
 						</DataTrigger>
 
-						<!--  Document Well : Tab : Button / Selected, inactive, hovered  -->
-						<MultiDataTrigger>
+						<!--  In VS DocumentFloatingWindow colors change only for header text and icon if window is inactive  -->
+                        <!--  Document Well : Tab : Button / Selected, inactive, hovered  -->
+                        <MultiDataTrigger>
 							<MultiDataTrigger.Conditions>
 								<Condition Binding="{Binding IsMouseOver, ElementName=PART_PinMaximize}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
 							<Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
 							<Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_PinRestore}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
-							<Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_PinRestore}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
+                            <Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
 							<Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_PinClose}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
-							<Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Document Well : Tab : Button / Selected, inactive, pressed  -->
-						<MultiDataTrigger>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_PinClose}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
+                            <Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+
+                        <!--  Document Well : Tab : Button / Selected, inactive, pressed  -->
+                        <MultiDataTrigger>
 							<MultiDataTrigger.Conditions>
 								<Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinMaximize}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
-							<Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
+                            <Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
 							<Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
 						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinRestore}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
-							<Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinClose}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
-							<Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Mark Active Document on CLick in Document Well : Tab : Button / Selected, active  -->
-						<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true">
-							<!--  Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" /  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinRestore}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
+                            <Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinClose}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
+                            <Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
+                        </MultiDataTrigger>
+
+                        <!--  Mark Active Document on CLick in Document Well : Tab : Button / Selected, active  --><!--
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true">
+							<Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
 							<Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
 							<Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
-						</DataTrigger>
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
+                        </DataTrigger>-->
 
-						<!--  Document Well : Tab : Button / Selected, active, hovered  -->
-						<!--  Highlight Maximize Button of Floating Window on MouseOver  -->
-						<MultiDataTrigger>
+                        <!--  Document Well : Tab : Button / Selected, active, hovered  -->
+                        <!--  Highlight Maximize Button of Floating Window on MouseOver  -->
+						<!--<MultiDataTrigger>
 							<MultiDataTrigger.Conditions>
 								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true" />
 								<Condition Binding="{Binding IsMouseOver, ElementName=PART_PinMaximize}" Value="True" />
@@ -1834,131 +1993,168 @@
 							<Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
 							<Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
 							<Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Highlight Restore Button of Floating Window on MouseOver  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_PinRestore}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
-							<Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
+						</MultiDataTrigger>-->
+
+                        <!--  Highlight Restore Button of Floating Window on MouseOver  -->
+                        <!--<MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_PinRestore}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
+                            <Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
 							<Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Highlight Close Button of Floating Window on MouseOver  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_PinClose}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
-							<Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Document Well : Tab : Button / Selected, active, pressed  -->
-						<!--  Highlight Maximize Button of Floating Window on MouseClick and Holding Bottun (even when Mouse is moved away)  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinMaximize}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
-							<Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
+                        </MultiDataTrigger>-->
+
+                        <!--  Highlight Close Button of Floating Window on MouseOver  -->
+                        <!--<MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_PinClose}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
+                            <Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
+                        </MultiDataTrigger>-->
+
+                        <!--  Document Well : Tab : Button / Selected, active, pressed  -->
+                        <!--  Highlight Maximize Button of Floating Window on MouseClick and Holding Bottun (even when Mouse is moved away)  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinMaximize}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
+                            <Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
 							<Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
 						</MultiDataTrigger>
 
-						<!--  Highlight Restore Button of Floating Window on MouseClick and Holding Bottun (even when Mouse is moved away)  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinRestore}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
-							<Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
+                        <!--  Highlight Restore Button of Floating Window on MouseClick and Holding Bottun (even when Mouse is moved away)  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinRestore}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
+                            <Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
 							<Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Highlight Close Button of Floating Window on MouseClick and Holding Bottun (even when Mouse is moved away)  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinClose}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
-							<Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
-						</MultiDataTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
+                        </MultiDataTrigger>
+
+                        <!--  Highlight Close Button of Floating Window on MouseClick and Holding Bottun (even when Mouse is moved away)  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinClose}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
+                            <Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
+                        </MultiDataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
 
-			</Setter.Value>
-		</Setter>
-	</Style>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-	<Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
-		<Setter Property="UseLayoutRounding" Value="True" />
-		<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.FloatingToolWindowBackground}}" />
+    <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+        <Setter Property="UseLayoutRounding" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.FloatingToolWindowBackground}}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.FloatingToolWindowBorder}}" />
 		<Setter Property="shell:WindowChrome.WindowChrome">
-			<Setter.Value>
-				<shell:WindowChrome
-					CaptionHeight="24"
+            <Setter.Value>
+                <shell:WindowChrome
+					CaptionHeight="21"
 					CornerRadius="0"
 					GlassFrameThickness="0"
 					ResizeBorderThickness="10" />
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
-					<Grid>
-						<Border
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+                    <Grid>
+                        <Border
 							x:Name="WindowBorder"
 							Background="{TemplateBinding Background}"
 							BorderBrush="{TemplateBinding BorderBrush}"
 							BorderThickness="1">
-							<Grid>
-								<Grid.RowDefinitions>
-									<RowDefinition Height="Auto" MinHeight="24" />
-									<!--  https://github.com/xceedsoftware/wpftoolkit/issues/1203  -->
-									<RowDefinition Height="*" />
-								</Grid.RowDefinitions>
-								<Border
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" MinHeight="21" />
+                                    <!--  https://github.com/xceedsoftware/wpftoolkit/issues/1203  -->
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
+                                <Border
 									x:Name="Header"
-									Padding="2,0,2,0"
+									Padding="2,2,3,3"
 									Background="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionInactiveBackground}}"
 									TextElement.Foreground="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionInactiveText}}">
 									<Grid UseLayoutRounding="True">
-										<Grid.ColumnDefinitions>
-											<ColumnDefinition Width="*" />
-											<ColumnDefinition Width="Auto" />
-											<ColumnDefinition Width="Auto" />
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto" />
 											<ColumnDefinition Width="Auto" />
 										</Grid.ColumnDefinitions>
 
-										<Border Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-											<avalonDockControls:DropDownControlArea
-												DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-												DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
-												Style="{DynamicResource DropDownControlArea}">
-												<ContentPresenter
+										<Rectangle
+											x:Name="DragHandleGeometryPlaceholder"
+											Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionInactiveGrip}}"
+											Visibility="Collapsed" />
+
+										<DockPanel>
+                                            <Border Padding="2,0,4,0" HorizontalAlignment="Left" Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
+                                                <avalonDockControls:DropDownControlArea
+													DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+													DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+													Style="{DynamicResource DropDownControlArea}">
+                                                    <ContentPresenter
 													Content="{Binding Model.SinglePane.SelectedContent, RelativeSource={RelativeSource TemplatedParent}}"
 													ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
 													ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
-											</avalonDockControls:DropDownControlArea>
-										</Border>
-
-										<avalonDockControls:DropDownButton
+                                                </avalonDockControls:DropDownControlArea>
+                                            </Border>
+
+                                            <Rectangle
+												x:Name="DragHandleTexture"
+												Height="5"
+												Margin="4,0,4,0"
+												VerticalAlignment="Center" 
+												UseLayoutRounding="True" 
+												RenderOptions.BitmapScalingMode="NearestNeighbor">
+                                                <Rectangle.Fill>
+                                                    <DrawingBrush
+														TileMode="Tile"
+														Viewbox="0,0,4,4"
+														ViewboxUnits="Absolute"
+														Viewport="0,0,4,4"
+														ViewportUnits="Absolute">
+                                                        <DrawingBrush.Drawing>
+                                                            <GeometryDrawing Brush="{Binding Fill, ElementName=DragHandleGeometryPlaceholder, Mode=OneWay, Converter={avalonDockConverters:NullToDoNothingConverter}}">
+                                                                <GeometryDrawing.Geometry>
+                                                                    <GeometryGroup>
+                                                                        <GeometryGroup.Children>
+                                                                            <RectangleGeometry Rect="0,0,1,1" />
+                                                                            <RectangleGeometry Rect="2,2,1,1" />
+                                                                        </GeometryGroup.Children>
+                                                                    </GeometryGroup>
+                                                                </GeometryDrawing.Geometry>
+                                                            </GeometryDrawing>
+                                                        </DrawingBrush.Drawing>
+                                                    </DrawingBrush>
+                                                </Rectangle.Fill>
+                                            </Rectangle>
+                                        </DockPanel>
+
+                                        <avalonDockControls:DropDownButton
 											x:Name="SinglePaneContextMenu"
 											Grid.Column="1"
-											Margin="2,0"
+											Margin="1,1,1,0"
+                                            Width="15"
+											Height="15"
 											HorizontalAlignment="Center"
 											VerticalAlignment="Center"
-											HorizontalContentAlignment="Center"
-											VerticalContentAlignment="Center"
 											shell:WindowChrome.IsHitTestVisibleInChrome="True"
 											DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
 											DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
@@ -1966,23 +2162,24 @@
 											Style="{StaticResource AvalonDockThemeVs2013ToolButtonStyle}"
 											ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}"
 											Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-											<Path
+                                            <Path
 												x:Name="PART_ImgPinMenu"
-												Width="11"
-												Height="11"
+												Margin="0,0,0,1"
+												Width="8"
+												Height="8"
 												Data="{DynamicResource PinMenu}"
 												Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}"
 												Stretch="Uniform" />
-										</avalonDockControls:DropDownButton>
+                                        </avalonDockControls:DropDownButton>
 
-										<Button
+                                        <Button
 											x:Name="PART_PinMaximize"
 											Grid.Column="2"
-											Margin="2,0"
+											Margin="0,1,1,0"
+                                            Width="15"
+											Height="15"
 											HorizontalAlignment="Center"
 											VerticalAlignment="Center"
-											HorizontalContentAlignment="Center"
-											VerticalContentAlignment="Center"
 											shell:WindowChrome.IsHitTestVisibleInChrome="True"
 											Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
 											CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
@@ -1990,20 +2187,22 @@
 											Style="{StaticResource AvalonDockThemeVs2013ButtonStyle}"
 											ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
 											Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:InverseBoolToVisibilityConverter}}">
-											<Path
+                                            <Path
 												x:Name="PART_ImgPinMaximize"
-												Width="11"
-												Height="11"
+												Width="9"
+												Height="9"
 												VerticalAlignment="Center"
 												Data="{DynamicResource PinMaximize}"
 												Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}"
 												Stretch="Uniform" />
-										</Button>
+                                        </Button>
 
-										<Button
+                                        <Button
 											x:Name="PART_PinRestore"
 											Grid.Column="2"
-											Margin="2,0"
+											Margin="0,1,1,0"
+                                            Width="15"
+											Height="15"
 											HorizontalAlignment="Center"
 											VerticalAlignment="Center"
 											shell:WindowChrome.IsHitTestVisibleInChrome="True"
@@ -2013,20 +2212,23 @@
 											Style="{StaticResource AvalonDockThemeVs2013ButtonStyle}"
 											ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
 											Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-											<Path
+                                            <Path
 												x:Name="PART_ImgPinRestore"
-												Width="11"
-												Height="11"
+												Width="10"
+												Height="10"
+												Margin="1,1,0,0"
 												VerticalAlignment="Center"
 												Data="{DynamicResource PinRestore}"
 												Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}"
 												Stretch="Uniform" />
-										</Button>
+                                        </Button>
 
-										<Button
+                                        <Button
 											x:Name="PART_PinClose"
 											Grid.Column="3"
-											Margin="2,0"
+											Margin="0,1,1,0"
+                                            Width="15"
+											Height="15"
 											HorizontalAlignment="Center"
 											VerticalAlignment="Center"
 											shell:WindowChrome.IsHitTestVisibleInChrome="True"
@@ -2035,285 +2237,288 @@
 											Style="{StaticResource AvalonDockThemeVs2013ButtonStyle}"
 											ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
 											Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={avalonDockConverters:BoolToVisibilityConverter}}">
-											<Path
+                                            <Path
 												x:Name="PART_ImgPinClose"
-												Width="11"
-												Height="11"
+												Width="10"
+												Height="10"
+												Margin="1,0,0,1"
 												VerticalAlignment="Center"
 												Data="{DynamicResource PinClose}"
 												Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveGlyph}}"
 												Stretch="Uniform" />
-										</Button>
-									</Grid>
-								</Border>
-								<ContentPresenter Grid.Row="1" Content="{TemplateBinding Content}" />
-							</Grid>
-						</Border>
-					</Grid>
-					<ControlTemplate.Triggers>
+                                        </Button>
+                                    </Grid>
+                                </Border>
+                                <ContentPresenter Grid.Row="1" Content="{TemplateBinding Content}" />
+                            </Grid>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
 						<Trigger Property="WindowState" Value="Maximized">
-							<Setter TargetName="WindowBorder" Property="Padding" Value="3" />
+							<Setter TargetName="WindowBorder" Property="Padding" Value="8" />
+							<Setter TargetName="WindowBorder" Property="BorderThickness" Value="0" />
 						</Trigger>
 						<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="True">
 							<Setter TargetName="Header" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionActiveBackground}}" />
 							<Setter TargetName="Header" Property="TextElement.Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionActiveText}}" />
+							<Setter TargetName="DragHandleGeometryPlaceholder" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionActiveGrip}}" />
 						</DataTrigger>
-						<DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.CanClose, RelativeSource={RelativeSource Mode=Self}}" Value="True">
-							<Setter TargetName="PART_PinClose" Property="Command" Value="{Binding CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}" />
-							<Setter TargetName="PART_PinClose" Property="ToolTip" Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
-						</DataTrigger>
-						<!--  Document Well : Tab : Button / Selected, inactive, hovered  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseOver, ElementName=SinglePaneContextMenu}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="SinglePaneContextMenu" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
-							<Setter TargetName="SinglePaneContextMenu" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_PinMaximize}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
-							<Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
+                        <DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.CanClose, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                            <Setter TargetName="PART_PinClose" Property="Command" Value="{Binding CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="PART_PinClose" Property="ToolTip" Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
+                        </DataTrigger>
+                        <!--  Document Well : Tab : Button / Selected, inactive, hovered  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, ElementName=SinglePaneContextMenu}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="SinglePaneContextMenu" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
+                            <Setter TargetName="SinglePaneContextMenu" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_PinMaximize}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
+                            <Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
 							<Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
 						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_PinRestore}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
-							<Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_PinClose}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
-							<Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Document Well : Tab : Button / Selected, inactive, pressed  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=SinglePaneContextMenu}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="SinglePaneContextMenu" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
-							<Setter TargetName="SinglePaneContextMenu" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsChecked, ElementName=SinglePaneContextMenu}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="SinglePaneContextMenu" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
-							<Setter TargetName="SinglePaneContextMenu" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinMaximize}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
-							<Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_PinRestore}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
+                            <Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_PinClose}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBackground}}" />
+                            <Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+
+                        <!--  Document Well : Tab : Button / Selected, inactive, pressed  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=SinglePaneContextMenu}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="SinglePaneContextMenu" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
+                            <Setter TargetName="SinglePaneContextMenu" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsChecked, ElementName=SinglePaneContextMenu}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="SinglePaneContextMenu" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
+                            <Setter TargetName="SinglePaneContextMenu" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinMaximize}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
+                            <Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
 							<Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
 						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinRestore}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
-							<Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinClose}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
-							<Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Document Well : Tab : Button / Selected, active  -->
-						<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true">
-							<Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
-							<Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinRestore}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
+                            <Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinClose}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBackground}}" />
+                            <Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedInactivePressedGlyph}}" />
+                        </MultiDataTrigger>
+
+                        <!--  Document Well : Tab : Button / Selected, active  -->
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true">
+                            <Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
+                            <Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
 							<Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
 							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveGlyph}}" />
-						</DataTrigger>
-
-						<!--  Document Well : Tab : Button / Selected, active, hovered  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseOver, ElementName=SinglePaneContextMenu}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="SinglePaneContextMenu" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
-							<Setter TargetName="SinglePaneContextMenu" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_PinMaximize}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
-							<Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_PinRestore}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
-							<Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseOver, ElementName=PART_PinClose}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
-							<Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
-						</MultiDataTrigger>
-
-						<!--  Document Well : Tab : Button / Selected, active, pressed  -->
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=SinglePaneContextMenu}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="SinglePaneContextMenu" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
-							<Setter TargetName="SinglePaneContextMenu" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
-								<Condition Binding="{Binding IsChecked, ElementName=SinglePaneContextMenu}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="SinglePaneContextMenu" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
-							<Setter TargetName="SinglePaneContextMenu" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinMaximize}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
-							<Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinRestore}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
-							<Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
-								<Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinClose}" Value="True" />
-							</MultiDataTrigger.Conditions>
-							<Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
-							<Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
-							<Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
-						</MultiDataTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
+                        </DataTrigger>
+
+                        <!--  Document Well : Tab : Button / Selected, active, hovered  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseOver, ElementName=SinglePaneContextMenu}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="SinglePaneContextMenu" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
+                            <Setter TargetName="SinglePaneContextMenu" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_PinMaximize}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
+                            <Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_PinRestore}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
+                            <Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseOver, ElementName=PART_PinClose}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBackground}}" />
+                            <Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActiveHoveredGlyph}}" />
+                        </MultiDataTrigger>
+
+                        <!--  Document Well : Tab : Button / Selected, active, pressed  -->
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=SinglePaneContextMenu}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="SinglePaneContextMenu" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
+                            <Setter TargetName="SinglePaneContextMenu" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsChecked, ElementName=SinglePaneContextMenu}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="SinglePaneContextMenu" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
+                            <Setter TargetName="SinglePaneContextMenu" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinMenu" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinMaximize}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinMaximize" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
+                            <Setter TargetName="PART_PinMaximize" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinMaximize" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinRestore}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinRestore" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
+                            <Setter TargetName="PART_PinRestore" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinRestore" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="true" />
+                                <Condition Binding="{Binding IsMouseCaptured, ElementName=PART_PinClose}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_PinClose" Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBackground}}" />
+                            <Setter TargetName="PART_PinClose" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedBorder}}" />
+                            <Setter TargetName="PART_ImgPinClose" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabButtonSelectedActivePressedGlyph}}" />
+                        </MultiDataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-	<Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
-		<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.TabBackground}}" />
-		<Setter Property="AnchorableStyle">
-			<Setter.Value>
-				<Style TargetType="avalonDockControls:LayoutAnchorableControl">
-					<Setter Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.PanelBorderBrush}}" />
-					<Setter Property="BorderThickness" Value="1" />
-				</Style>
-			</Setter.Value>
-		</Setter>
-	</Style>
+    <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.TabBackground}}" />
+        <Setter Property="AnchorableStyle">
+            <Setter.Value>
+                <Style TargetType="avalonDockControls:LayoutAnchorableControl">
+                    <Setter Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.PanelBorderBrush}}" />
+                    <Setter Property="BorderThickness" Value="1" />
+                </Style>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
 
-	<Style x:Key="AvalonDockThemeVs2013NavigatorWindowListBoxItemFocusVisual">
-		<Setter Property="Control.Template">
-			<Setter.Value>
-				<ControlTemplate>
-					<Rectangle
+    <Style x:Key="AvalonDockThemeVs2013NavigatorWindowListBoxItemFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle
 						RadiusX="2"
 						RadiusY="2"
 						Stroke="{DynamicResource {x:Static reskeys:ResourceKeys.PanelBorderBrush}}"
 						StrokeThickness="1" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-	<Style x:Key="AvalonDockThemeVs2013NavigatorWindowListBoxItemStyle" TargetType="ListBoxItem">
-		<Setter Property="FocusVisualStyle" Value="{StaticResource AvalonDockThemeVs2013NavigatorWindowListBoxItemFocusVisual}" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.NavigatorWindowForeground}}" />
-		<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
+    <Style x:Key="AvalonDockThemeVs2013NavigatorWindowListBoxItemStyle" TargetType="ListBoxItem">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource AvalonDockThemeVs2013NavigatorWindowListBoxItemFocusVisual}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.NavigatorWindowForeground}}" />
+        <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}"
 						SnapsToDevicePixels="true">
-						<Border x:Name="InnerBorder" BorderThickness="1">
-							<Grid>
-								<Grid.RowDefinitions>
-									<RowDefinition MaxHeight="11" />
-									<RowDefinition />
-								</Grid.RowDefinitions>
-								<Rectangle
+                        <Border x:Name="InnerBorder" BorderThickness="1">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition MaxHeight="11" />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <Rectangle
 									x:Name="UpperHighlight"
 									Fill="#75FFFFFF"
 									Visibility="Collapsed" />
-								<ContentPresenter
+                                <ContentPresenter
 									Grid.RowSpan="2"
 									VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
 									SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-							</Grid>
-						</Border>
-					</Border>
-					<ControlTemplate.Triggers>
-						<!--<Trigger Property="IsMouseOver" Value="true">
+                            </Grid>
+                        </Border>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <!--<Trigger Property="IsMouseOver" Value="true">
                             <Setter Property="Background" Value="{StaticResource AvalonDockThemeVs2013NavigatorWindowListBoxItemSelectedFill}" />
                             <Setter Property="BorderBrush" Value="#FF98DDFB" />
                             <Setter TargetName="InnerBorder" Property="BorderBrush" Value="#80FFFFFF" />
                             <Setter TargetName="UpperHighlight" Property="Visibility" Value="Visible" />
                             <Setter TargetName="UpperHighlight" Property="Fill" Value="#40FFFFFF" />
                         </Trigger>-->
-						<Trigger Property="IsSelected" Value="true">
-							<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.NavigatorWindowSelectedBackground}}" />
-							<Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.NavigatorWindowSelectedText}}" />
-							<!--<Setter Property="BorderBrush" Value="#FF98DDFB" />-->
-							<!--<Setter TargetName="InnerBorder" Property="BorderBrush" Value="#80FFFFFF" />-->
-							<!--<Setter TargetName="UpperHighlight" Property="Visibility" Value="Visible" />
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.NavigatorWindowSelectedBackground}}" />
+                            <Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static reskeys:ResourceKeys.NavigatorWindowSelectedText}}" />
+                            <!--<Setter Property="BorderBrush" Value="#FF98DDFB" />-->
+                            <!--<Setter TargetName="InnerBorder" Property="BorderBrush" Value="#80FFFFFF" />-->
+                            <!--<Setter TargetName="UpperHighlight" Property="Visibility" Value="Visible" />
                             <Setter TargetName="UpperHighlight" Property="Fill" Value="#40FFFFFF" />-->
-						</Trigger>
-						<!--
+                        </Trigger>
+                        <!--
                             <MultiTrigger>
                             <MultiTrigger.Conditions>
                             <Condition Property="IsSelected" Value="true"/>
@@ -2323,57 +2528,57 @@
                             <Setter Property="BorderBrush" Value="#FF98DDFB"/>
                             </MultiTrigger>
 						-->
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
+                        <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 {x:Static SystemColors.ControlBrushKey}}" />
-		<Setter Property="SizeToContent" Value="WidthAndHeight" />
-		<Setter Property="ResizeMode" Value="NoResize" />
-		<!--<Setter Property="shell:WindowChrome.WindowChrome">
+    <Style x:Key="{x:Type avalonDockControls:NavigatorWindow}" TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+        <Setter Property="SizeToContent" Value="WidthAndHeight" />
+        <Setter Property="ResizeMode" Value="NoResize" />
+        <!--<Setter Property="shell:WindowChrome.WindowChrome">
             <Setter.Value>
                 <shell:WindowChrome CaptionHeight="16"
                                     GlassFrameThickness="4"
                                     ResizeBorderThickness="10" />
             </Setter.Value>
         </Setter>-->
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
-					<Grid>
-						<Border
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+                    <Grid>
+                        <Border
 							x:Name="WindowBorder"
 							Background="{DynamicResource {x:Static reskeys:ResourceKeys.NavigatorWindowBackground}}"
 							BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.PanelBorderBrush}}"
 							BorderThickness="1">
-							<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
+                            <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, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:NullToDoNothingConverter}}"
 											Stretch="None"
 											Visibility="{Binding SelectedDocument.LayoutElement.IconSource, RelativeSource={RelativeSource TemplatedParent}, Converter={avalonDockConverters:BoolToVisibilityConverter}}" />
-										<TextBlock
+                                        <TextBlock
 											x:Name="selectedElementTitle"
 											Grid.Column="1"
 											Margin="4,0,0,0"
@@ -2382,36 +2587,36 @@
 											Foreground="{DynamicResource {x:Static reskeys:ResourceKeys.NavigatorWindowForeground}}"
 											Text="{Binding SelectedDocument.LayoutElement.Title, RelativeSource={RelativeSource TemplatedParent}}"
 											TextTrimming="CharacterEllipsis" />
-									</Grid>
-									<TextBlock
+                                    </Grid>
+                                    <TextBlock
 										x:Name="selectedElementDescription"
 										VerticalAlignment="Center"
 										Text="{Binding SelectedDocument.LayoutElement.Description}"
 										TextTrimming="CharacterEllipsis" />
-								</Grid>
+                                </Grid>
 
-								<Border
+                                <Border
 									Grid.Row="1"
 									MinHeight="200"
 									Background="{DynamicResource {x:Static reskeys:ResourceKeys.NavigatorWindowBackground}}"
 									BorderBrush="Transparent"
 									BorderThickness="0,1,0,0">
-									<Grid Margin="5">
-										<Grid.ColumnDefinitions>
-											<ColumnDefinition Width="Auto" />
-											<ColumnDefinition />
-										</Grid.ColumnDefinitions>
-										<Grid Margin="5">
-											<Grid.RowDefinitions>
-												<RowDefinition Height="Auto" />
-												<RowDefinition />
-											</Grid.RowDefinitions>
-											<TextBlock
+                                    <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"
 												Foreground="{DynamicResource {x:Static reskeys:ResourceKeys.NavigatorWindowForeground}}"
 												Text="{x:Static avalonDockProperties:Resources.Active_ToolWindows}" />
-											<ListBox
+                                            <ListBox
 												x:Name="PART_AnchorableListBox"
 												Grid.Row="1"
 												MaxHeight="400"
@@ -2419,36 +2624,36 @@
 												ItemContainerStyle="{StaticResource AvalonDockThemeVs2013NavigatorWindowListBoxItemStyle}"
 												ItemsSource="{Binding Anchorables}"
 												SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}">
-												<ListBox.ItemTemplate>
-													<DataTemplate>
-														<Grid>
-															<Grid.ColumnDefinitions>
-																<ColumnDefinition Width="16" />
-																<ColumnDefinition Width="150" />
-															</Grid.ColumnDefinitions>
-															<Image Source="{Binding LayoutElement.IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}" Stretch="None" />
-															<TextBlock
+                                                <ListBox.ItemTemplate>
+                                                    <DataTemplate>
+                                                        <Grid>
+                                                            <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
+                                                        </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"
 												Foreground="{DynamicResource {x:Static reskeys:ResourceKeys.NavigatorWindowForeground}}"
 												Text="{x:Static avalonDockProperties:Resources.Active_Files}" />
 
-											<ListBox
+                                            <ListBox
 												x:Name="PART_DocumentListBox"
 												Grid.Row="1"
 												MaxHeight="400"
@@ -2456,50 +2661,50 @@
 												ItemContainerStyle="{StaticResource AvalonDockThemeVs2013NavigatorWindowListBoxItemStyle}"
 												ItemsSource="{Binding Documents}"
 												SelectedItem="{Binding SelectedDocument, Mode=TwoWay}">
-												<ListBox.ItemTemplate>
-													<DataTemplate>
-														<Grid>
-															<Grid.ColumnDefinitions>
-																<ColumnDefinition Width="16" />
-																<ColumnDefinition Width="150" />
-															</Grid.ColumnDefinitions>
-															<Image Source="{Binding LayoutElement.IconSource, Converter={avalonDockConverters:NullToDoNothingConverter}}" Stretch="None" />
-															<TextBlock
+                                                <ListBox.ItemTemplate>
+                                                    <DataTemplate>
+                                                        <Grid>
+                                                            <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
+                                                        </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"
 										Foreground="{DynamicResource {x:Static reskeys:ResourceKeys.NavigatorWindowForeground}}"
 										Text="{Binding SelectedDocument.LayoutElement.ToolTip, RelativeSource={RelativeSource TemplatedParent}}" />
-								</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>
+                                </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>
 
 </ResourceDictionary>
diff --git a/source/Components/AvalonDock.Themes.VS2013/Themes/Icons/IconGeometry.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Icons/IconGeometry.xaml
index a94f092e..92f0957c 100644
--- a/source/Components/AvalonDock.Themes.VS2013/Themes/Icons/IconGeometry.xaml
+++ b/source/Components/AvalonDock.Themes.VS2013/Themes/Icons/IconGeometry.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 	<PathGeometry x:Key="PinAutoHide" Figures="M 128,17.475L 130.842,17.475L 130.842,2.91001L 130.842,0.608195L 130.842,0.000223796L 139.593,0.000223796L 145.003,0.000223796L 145.424,0.000223796L 145.424,17.475L 148.413,17.475L 148.413,20.3848L 139.684,20.3848L 139.684,32.0003L 136.752,32.0003L 136.752,20.3848L 128,20.3848L 128,17.475 Z M 133.774,2.91007L 133.774,17.475L 139.593,17.475L 139.593,2.91007L 133.774,2.91007 Z" />
 	<PathGeometry x:Key="HTabGroup" Figures="M 2.53856,7.38456L 2.53856,12.3846L 31.9231,12.3846L 31.9231,7.38456L 2.53856,7.38456 Z M 0,0.000162761L 34.3846,0.000162761L 34.3846,14.7694L 0,14.7694L 0,0.000162761 Z M 2.53861,24.6155L 2.53861,29.6155L 31.9232,29.6155L 31.9232,24.6155L 2.53861,24.6155 Z M 5.00801e-005,17.2309L 34.3846,17.2309L 34.3846,32.0001L 5.00801e-005,32.0001L 5.00801e-005,17.2309 Z " />
 	<PathGeometry x:Key="VTabGroup" Figures="M 64,0.000223796L 101.319,0.000223796L 101.319,32.0002L 64,32.0002L 64,0.000223796 Z M 66.6804,8.03752L 66.6804,29.3154L 79.896,29.3154L 79.896,8.03752L 66.6804,8.03752 Z M 85.4232,8.03746L 85.4232,29.3154L 98.6388,29.3154L 98.6388,8.03746L 85.4232,8.03746 Z " />
@@ -6,8 +6,8 @@
 	<PathGeometry x:Key="DockPaneEmpty" Figures="M 266.388,0.000223796L 277.612,0.000223796L 277.612,7.60856L 280.392,10.3883L 288,10.3883L 288,21.6122L 280.392,21.6122L 277.612,24.3919L 277.612,32.0002L 266.388,32.0002L 266.388,24.3919L 263.608,21.6122L 256,21.6122L 256,10.3883L 263.608,10.3883L 266.388,7.60856L 266.388,0.000223796 Z " />
 	<PathGeometry x:Key="PinMenu" Figures="M 352.041,32.0005L 320,0.000162761L 384,0.000162761L 352.041,32.0005 Z " />
 	<PathGeometry x:Key="PinClose" Figures="M 0,2.0345e-005L 7.62109,2.0345e-005L 19.2627,12.0551L 30.9043,2.0345e-005L 38.5241,2.0345e-005L 23.0726,16.0003L 38.5234,32L 30.9023,32L 19.2621,19.9462L 7.62177,32L 0.00195313,32L 15.4521,16.001L 0,2.0345e-005 Z" />
-	<PathGeometry x:Key="PinRestore" Figures="M 480,6.27958L 486.48,6.27958L 486.48,0.000101726L 512.201,0.000101726L 512.201,25.7207L 505.721,25.7207L 505.721,32.0001L 480,32.0001L 480,6.27958 Z M 505.721,6.27964L 505.721,22.5896L 508.852,22.5896L 508.852,3.29911L 489.561,3.29911L 489.561,6.27964L 505.721,6.27964 Z M 483.081,9.57847L 483.081,28.8689L 502.371,28.8689L 502.371,9.57847L 483.081,9.57847 Z " />
-	<PathGeometry x:Key="PinMaximize" Figures="M 544,4.06904e-005L 576,4.06904e-005L 576,32L 544,32L 544,4.06904e-005 Z M 547.2,3.20011L 547.2,28.8001L 572.8,28.8001L 572.8,3.20011L 547.2,3.20011 Z " />
+	<PathGeometry x:Key="PinRestore" Figures="M0,10L0,3 3,3 3,0 10,0 10,2 4,2 4,3 7,3 7,6 6,6 6,5 1,5 1,10z M1,10L7,10 7,7 10,7 10,2 9,2 9,6 6,6 6,9 1,9z" />
+	<PathGeometry x:Key="PinMaximize" Figures="M0,0L0,9 9,9 9,0 0,0 0,3 8,3 8,8 1,8 1,3 0,3z" />
 	<PathGeometry x:Key="PinDocMenu" Figures="M 608,0.000223796L 640,0.000223796L 640,7.70652L 608,7.70652L 608,0.000223796 Z M 624.021,32.0002L 608,16.0001L 640,16.0001L 624.021,32.0002 Z " />
 	<PathGeometry x:Key="Locked" Figures="M 1.77411,12.4183L 23.0627,12.4183C 24.0423,12.4183 24.8366,13.2126 24.8366,14.1925L 24.8366,30.1588C 24.8366,31.1386 24.0423,31.9329 23.0627,31.9329L 1.77411,31.9329C 0.794312,31.9329 0,31.1386 0,30.1588L 0,14.1925C 0,13.2126 0.794312,12.4183 1.77411,12.4183 Z M 14.5149,22.095C 15.0955,21.6111 15.4826,20.9337 15.4826,20.1595C 15.4826,18.805 14.4182,17.7404 13.0635,17.7404C 11.7087,17.7404 10.6442,18.8048 10.6442,20.1595C 10.6442,20.9337 11.0313,21.6111 11.6119,22.095L 11.6119,24.0302C 11.6119,24.8044 12.2893,25.4818 13.0633,25.4818C 13.8375,25.4818 14.5149,24.8044 14.5149,24.0302L 14.5149,22.095 Z M 20.9659,12.4183L 18.063,12.4183L 18.063,8.70894C 18.063,5.51565 15.4504,2.90304 12.257,2.90304C 9.06372,2.90304 6.45111,5.51565 6.45111,8.70894L 6.45111,12.4183L 3.54816,12.4183L 3.54816,8.70894C 3.54816,3.87069 7.41882,2.03401e-005 12.257,2.03401e-005C 17.0955,2.03401e-005 20.9659,3.87069 20.9659,8.70894L 20.9659,12.4183 Z " />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/LayoutInitializer.cs b/source/VS2013Test/LayoutInitializer.cs
index b5d8fa48..356156b3 100644
--- a/source/VS2013Test/LayoutInitializer.cs
+++ b/source/VS2013Test/LayoutInitializer.cs
@@ -12,12 +12,13 @@ public bool BeforeInsertAnchorable(LayoutRoot layout, LayoutAnchorable anchorabl
 			//just for test provide a new anchorablepane 
 			//if the pane is floating let the manager go ahead
 			LayoutAnchorablePane destPane = destinationContainer as LayoutAnchorablePane;
-			anchorableToShow.AutoHideWidth = 256;
-			anchorableToShow.AutoHideHeight = 128;
-
 			if (destinationContainer != null && destinationContainer.FindParent<LayoutFloatingWindow>() != null)
 				return false;
 
+			anchorableToShow.AutoHideWidth = 256;
+			anchorableToShow.AutoHideHeight = 128;
+			anchorableToShow.CanShowOnHover = false;
+
 			if (anchorableToShow.Content is ExplorerViewModel)
 			{
 				var explorerPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "ExplorerPane");
@@ -69,15 +70,6 @@ public bool BeforeInsertAnchorable(LayoutRoot layout, LayoutAnchorable anchorabl
 
 			if (anchorableToShow.Content is ErrorViewModel)
 			{
-				//var errorsPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "ErrorsPane");
-
-				//if (errorsPane != null)
-				//{
-				//	errorsPane.Children.Add(anchorableToShow);
-				//	anchorableToShow.Hide(false);
-				//	return true;
-				//}
-
 				var bottomGroup = new LayoutAnchorGroup();
 				bottomGroup.Children.Add(anchorableToShow);
 				layout.BottomSide.Children.Add(bottomGroup);
diff --git a/source/VS2013Test/Themes/BlueBrushsExtended.xaml b/source/VS2013Test/Themes/BlueBrushsExtended.xaml
index 949604b3..80c4c66b 100644
--- a/source/VS2013Test/Themes/BlueBrushsExtended.xaml
+++ b/source/VS2013Test/Themes/BlueBrushsExtended.xaml
@@ -19,6 +19,7 @@
 	<SolidColorBrush x:Key="ProjectNameForeground" Color="#FF40568D" />
 	<SolidColorBrush x:Key="ProjectNameInactiveForeground" Color="#664C5787" />
 	<SolidColorBrush x:Key="ProjectNameBackground" Color="#D9E0F8" />
+	<SolidColorBrush x:Key="ScrollViewerRectBackground" Color="#F5F5F5" />
 	<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MLib_reskeys:ResourceKeys}, ResourceId=NormalBackgroundBrushKey}" Color="Transparent" />
 	<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MLib_reskeys:ResourceKeys}, ResourceId=TopLevelHeaderMenuBackgroundKey}" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/Themes/DarkBrushsExtended.xaml b/source/VS2013Test/Themes/DarkBrushsExtended.xaml
index 20cbd19b..71a27586 100644
--- a/source/VS2013Test/Themes/DarkBrushsExtended.xaml
+++ b/source/VS2013Test/Themes/DarkBrushsExtended.xaml
@@ -19,6 +19,7 @@
 	<SolidColorBrush x:Key="ProjectNameForeground" Color="White" />
 	<SolidColorBrush x:Key="ProjectNameInactiveForeground" Color="#818181" />
 	<SolidColorBrush x:Key="ProjectNameBackground" Color="#252526" />
+	<SolidColorBrush x:Key="ScrollViewerRectBackground" Color="#333333" />
 	<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MLib_reskeys:ResourceKeys}, ResourceId=NormalBackgroundBrushKey}" Color="Transparent" />
 	<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MLib_reskeys:ResourceKeys}, ResourceId=TopLevelHeaderMenuBackgroundKey}" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/Themes/Generic.xaml b/source/VS2013Test/Themes/Generic.xaml
index 5b7e481b..6c9b22e9 100644
--- a/source/VS2013Test/Themes/Generic.xaml
+++ b/source/VS2013Test/Themes/Generic.xaml
@@ -12,7 +12,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Button}">
 					<Border Background="{TemplateBinding Background}">
-						<Path Width="46" Height="32" StrokeThickness="1" Stroke="{TemplateBinding Foreground}" Data="M 18,11 27,20 M 18,20 27,11"/>
+						<Path Width="46" Height="32" StrokeThickness="1" Stroke="{TemplateBinding Foreground}" Data="M 18,11 27,20 M 18,20 27,11" Margin="0,2,0,0"/>
 					</Border>
 
 					<ControlTemplate.Triggers>
@@ -43,7 +43,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Button}">
 					<Border Background="{TemplateBinding Background}">
-						<Path x:Name="MaximizePath" Width="46" Height="32" Data="M 18.5,10.5 H 27.5 V 19.5 H 18.5 Z" Stroke="{TemplateBinding Foreground}" StrokeThickness="1" />
+						<Path x:Name="MaximizePath" Width="46" Height="32" Data="M 18.5,10.5 H 27.5 V 19.5 H 18.5 Z" Stroke="{TemplateBinding Foreground}" StrokeThickness="1" Margin="0,2,0,0"/>
 					</Border>
 
 					<ControlTemplate.Triggers>
@@ -78,7 +78,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Button}">
 					<Border Background="{TemplateBinding Background}">
-						<Path x:Name="RestoreDownPath" Width="46" Height="32" Data="M 18.5,12.5 H 25.5 V 19.5 H 18.5 Z M 20.5,12.5 V 10.5 H 27.5 V 17.5 H 25.5" Stroke="{TemplateBinding Foreground}" StrokeThickness="1" />
+						<Path x:Name="RestoreDownPath" Width="46" Height="32" Data="M 18.5,12.5 H 25.5 V 19.5 H 18.5 Z M 20.5,12.5 V 10.5 H 27.5 V 17.5 H 25.5" Stroke="{TemplateBinding Foreground}" StrokeThickness="1" Margin="0,2,0,0"/>
 					</Border>
 
 					<ControlTemplate.Triggers>
@@ -113,7 +113,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Button}">
 					<Border Background="{TemplateBinding Background}">
-						<Path Width="46" Height="32" StrokeThickness="1" Stroke="{TemplateBinding Foreground}" Data="M 18,15 H 28"/>
+						<Path Width="46" Height="32" StrokeThickness="1" Stroke="{TemplateBinding Foreground}" Data="M 18,15 H 28" Margin="0,2,0,0"/>
 					</Border>
 
 					<ControlTemplate.Triggers>
diff --git a/source/VS2013Test/Themes/LightBrushsExtended.xaml b/source/VS2013Test/Themes/LightBrushsExtended.xaml
index 72fe253f..101178ad 100644
--- a/source/VS2013Test/Themes/LightBrushsExtended.xaml
+++ b/source/VS2013Test/Themes/LightBrushsExtended.xaml
@@ -19,6 +19,7 @@
 	<SolidColorBrush x:Key="ProjectNameForeground" Color="Black" />
 	<SolidColorBrush x:Key="ProjectNameInactiveForeground" Color="#929496" />
 	<SolidColorBrush x:Key="ProjectNameBackground" Color="#E0E3E6" />
+	<SolidColorBrush x:Key="ScrollViewerRectBackground" Color="#F5F5F5" />
 	<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MLib_reskeys:ResourceKeys}, ResourceId=NormalBackgroundBrushKey}" Color="Transparent" />
 	<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MLib_reskeys:ResourceKeys}, ResourceId=TopLevelHeaderMenuBackgroundKey}" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/VS2013Test/ViewModels/FileViewModel.cs b/source/VS2013Test/ViewModels/FileViewModel.cs
index 884c5281..25a0ed26 100644
--- a/source/VS2013Test/ViewModels/FileViewModel.cs
+++ b/source/VS2013Test/ViewModels/FileViewModel.cs
@@ -7,7 +7,7 @@ namespace AvalonDock.VS2013Test.ViewModels
 	class FileViewModel : PaneViewModel
 	{
 		#region fields
-		private static ImageSourceConverter ISC = new ImageSourceConverter();
+		//private static ImageSourceConverter ISC = new ImageSourceConverter();
 		private string _filePath = null;
 		private string _textContent = string.Empty;
 		private bool _isDirty = false;
@@ -27,7 +27,7 @@ public FileViewModel(string filePath)
 			Title = FileName;
 
 			//Set the icon only for open documents (just a test)
-			IconSource = ISC.ConvertFromInvariantString(@"pack://application:,,/Images/document.png") as ImageSource;
+			//IconSource = ISC.ConvertFromInvariantString(@"pack://application:,,/Images/document.png") as ImageSource;
 		}
 
 		/// <summary>
diff --git a/source/VS2013Test/ViewModels/Workspace.cs b/source/VS2013Test/ViewModels/Workspace.cs
index e24418ee..ba900a74 100644
--- a/source/VS2013Test/ViewModels/Workspace.cs
+++ b/source/VS2013Test/ViewModels/Workspace.cs
@@ -15,7 +15,6 @@ internal class Workspace : ViewModelBase
 		#region fields
 
 		private static Workspace _this = new Workspace();
-
 		private ToolViewModel[] _tools;
 		private ObservableCollection<FileViewModel> _files = new ObservableCollection<FileViewModel>();
 		private ReadOnlyObservableCollection<FileViewModel> _readonyFiles;
@@ -28,7 +27,7 @@ internal class Workspace : ViewModelBase
 		private ToolboxViewModel _toolbox;
 		private RelayCommand _openCommand;
 		private RelayCommand _newCommand;
-		private Tuple<string, Theme> selectedTheme;
+		private Tuple<string, Theme> _selectedTheme;
 
 		#endregion fields
 
@@ -39,6 +38,7 @@ internal class Workspace : ViewModelBase
 		/// </summary>
 		public Workspace()
 		{
+			SelectedTheme = Themes.First();
 		}
 
 		#endregion constructors
@@ -186,10 +186,10 @@ public FileViewModel ActiveDocument
 
 		public Tuple<string, Theme> SelectedTheme
 		{
-			get { return selectedTheme; }
+			get { return _selectedTheme; }
 			set
 			{
-				selectedTheme = value;
+				_selectedTheme = value;
 				SwitchExtendedTheme();
 				RaisePropertyChanged(nameof(SelectedTheme));
 			}
@@ -201,7 +201,7 @@ public Tuple<string, Theme> SelectedTheme
 
 		private void SwitchExtendedTheme()
 		{
-			switch (selectedTheme.Item1)
+			switch (_selectedTheme.Item1)
 			{
 				case "Vs2013DarkTheme":
 					Application.Current.Resources.MergedDictionaries[0].Source = new Uri("pack://application:,,,/MLib;component/Themes/DarkTheme.xaml");
@@ -239,11 +239,16 @@ internal void Close(FileViewModel fileToClose)
 
 		internal void Save(FileViewModel fileToSave, bool saveAsFlag = false)
 		{
+			string newTitle = string.Empty;
+
 			if (fileToSave.FilePath == null || saveAsFlag)
 			{
 				var dlg = new SaveFileDialog();
 				if (dlg.ShowDialog().GetValueOrDefault())
-					fileToSave.FilePath = dlg.SafeFileName;
+				{
+					fileToSave.FilePath = dlg.FileName;
+					newTitle = dlg.SafeFileName;
+				}
 			}
 			if (fileToSave.FilePath == null)
 			{
@@ -251,6 +256,9 @@ internal void Save(FileViewModel fileToSave, bool saveAsFlag = false)
 			}
 			File.WriteAllText(fileToSave.FilePath, fileToSave.TextContent);
 			ActiveDocument.IsDirty = false;
+
+			if (string.IsNullOrEmpty(newTitle)) return;
+			ActiveDocument.Title = newTitle;
 		}
 
 		internal FileViewModel Open(string filepath)
diff --git a/source/VS2013Test/Views/MainView.xaml b/source/VS2013Test/Views/MainView.xaml
index 75b0e539..d942ac89 100644
--- a/source/VS2013Test/Views/MainView.xaml
+++ b/source/VS2013Test/Views/MainView.xaml
@@ -7,11 +7,8 @@
 		xmlns:viewModels="clr-namespace:AvalonDock.VS2013Test.ViewModels"
 		xmlns:icons="clr-namespace:VS2013Test.Icons"
         mc:Ignorable="d"
-        Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="900" Width="1600" SnapsToDevicePixels="True" Foreground="{DynamicResource WindowForeground}" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResizeWithGrip" StateChanged="WindowStateChanged">
-
-	<Window.DataContext>
-		<viewModels:Workspace/>
-	</Window.DataContext>
+		d:DataContext="{d:DesignInstance viewModels:Workspace, IsDesignTimeCreatable=True}"
+        Title="VS2013Test" MinWidth="140" MinHeight="116" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="900" Width="1600" SnapsToDevicePixels="True" Foreground="{DynamicResource WindowForeground}" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResizeWithGrip" StateChanged="WindowStateChanged">
 
 	<WindowChrome.WindowChrome>
 		<WindowChrome x:Name="chrome" ResizeBorderThickness="8" CornerRadius="0" GlassFrameThickness="0" NonClientFrameEdges="None" />
@@ -43,7 +40,7 @@
 		<Grid.RowDefinitions>
 			<RowDefinition Height="Auto"/>
 			<RowDefinition/>
-			<RowDefinition Height="Auto"/>
+			<RowDefinition Height="23"/>
 		</Grid.RowDefinitions>
 
 		<Grid x:Name="header" SizeChanged="HeaderSizeChanged">
@@ -79,8 +76,6 @@
 						<MenuItem Command="{Binding ActiveDocument.CloseCommand}" Header="Close" />
 					</MenuItem>
 
-					<MenuItem Header="Edit"/>
-
 					<MenuItem Header="View">
 						<MenuItem Header="SolutionExplorer" IsCheckable="True" IsChecked="{Binding Explorer.IsVisible, Mode=TwoWay}" />
 						<MenuItem Header="Properties" IsCheckable="True" IsChecked="{Binding Props.IsVisible, Mode=TwoWay}" />
@@ -91,18 +86,18 @@
 					</MenuItem>
 				</Menu>
 
-				<ComboBox Margin="4,0"
-				 WindowChrome.IsHitTestVisibleInChrome="True"
-				DisplayMemberPath="Item1"
-				ItemsSource="{Binding Themes}"
-				SelectedItem="{Binding SelectedTheme}" SelectedIndex="0" />
+				<ComboBox 
+					Margin="4,0"
+					WindowChrome.IsHitTestVisibleInChrome="True"
+					DisplayMemberPath="Item1"
+					ItemsSource="{Binding Themes}"
+					SelectedItem="{Binding SelectedTheme}" />
 
 				<Border Background="{DynamicResource ProjectNameBackground}" Padding="8,0" Margin="14,0">
 					<TextBlock Text="VS2013 Demo" VerticalAlignment="Center" Padding="0,1,0,0">
 						<TextBlock.Style>
 							<Style TargetType="TextBlock">
 								<Setter Property="Foreground" Value="{DynamicResource ProjectNameForeground}"/>
-
 								<Style.Triggers>
 									<DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
 										<Setter Property="Foreground" Value="{DynamicResource ProjectNameInactiveForeground}" />
@@ -164,6 +159,7 @@
 
 		<DockingManager
             Grid.Row="1"
+			AutoHideDelay="0"
 		    ActiveContent="{Binding ActiveDocument, Mode=TwoWay, Converter={StaticResource ActiveDocumentConverter}}"
 		    AnchorablesSource="{Binding Tools}"
 		    DocumentsSource="{Binding Files}"
@@ -173,7 +169,21 @@
 				<local:PanesTemplateSelector>
 					<local:PanesTemplateSelector.FileViewTemplate>
 						<DataTemplate>
-							<TextBox Background="Transparent" Foreground="{DynamicResource WindowForeground}" CaretBrush="{DynamicResource WindowForeground}" FontFamily="Consolas" BorderThickness="0" Padding="2,4" Text="{Binding TextContent, UpdateSourceTrigger=PropertyChanged}" AcceptsReturn="True" AcceptsTab="True" />
+							<Grid>
+								<ScrollViewer HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible">
+									<TextBox 
+										Background="Transparent" 
+										Foreground="{DynamicResource WindowForeground}" 
+										CaretBrush="{DynamicResource WindowForeground}" 
+										FontFamily="Consolas" 
+										BorderThickness="0" 
+										Padding="2,4" 
+										Text="{Binding TextContent, UpdateSourceTrigger=PropertyChanged}" 
+										AcceptsReturn="True" 
+										AcceptsTab="True" />
+								</ScrollViewer>
+								<Rectangle Fill="{DynamicResource ScrollViewerRectBackground}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="17" Height="17"/>
+							</Grid>
 						</DataTemplate>
 					</local:PanesTemplateSelector.FileViewTemplate>
 					<local:PanesTemplateSelector.PropertiesViewTemplate>
@@ -213,23 +223,20 @@
 				<local:PanesStyleSelector>
 					<local:PanesStyleSelector.ToolStyle>
 						<Style TargetType="{x:Type LayoutAnchorableItem}">
-							<Setter Property="Title" Value="{Binding Model.Title, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+							<Setter Property="Title" Value="{Binding Model.Title}" />
+							<Setter Property="CanHide" Value="True" />
 							<Setter Property="Visibility" Value="{Binding Model.IsVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter={x:Static Visibility.Hidden}}" />
-							<Setter Property="ContentId" Value="{Binding Model.ContentId, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+							<Setter Property="ContentId" Value="{Binding Model.ContentId}" />
 							<Setter Property="IsSelected" Value="{Binding Model.IsSelected, Mode=TwoWay}" />
 							<Setter Property="IsActive" Value="{Binding Model.IsActive, Mode=TwoWay}" />
-							<Setter Property="CanHide" Value="True" />
 						</Style>
 					</local:PanesStyleSelector.ToolStyle>
 					<local:PanesStyleSelector.FileStyle>
 						<Style TargetType="{x:Type LayoutItem}">
 							<Setter Property="Title" Value="{Binding Model.Title}" />
 							<Setter Property="ToolTip" Value="{Binding Model.FilePath}" />
-							<Setter Property="IsActive" Value="{Binding Model.IsActive, Mode=TwoWay}" />
 							<Setter Property="CloseCommand" Value="{Binding Model.CloseCommand}" />
-							<Setter Property="IconSource" Value="{Binding Model.IconSource}" />
 							<Setter Property="ContentId" Value="{Binding Model.ContentId}" />
-							<Setter Property="CanClose" Value="True"/>
 						</Style>
 					</local:PanesStyleSelector.FileStyle>
 				</local:PanesStyleSelector>
@@ -257,7 +264,7 @@
 			</LayoutRoot>
 		</DockingManager>
 
-		<Border Grid.Row="2" Height="23" Background="{DynamicResource StatusBarBackground}">
+		<Border Grid.Row="2" Background="{DynamicResource StatusBarBackground}">
 			<Grid>
 				<StackPanel Orientation="Horizontal">
 					<Path Stroke="White" StrokeThickness="1" VerticalAlignment="Bottom" Margin="7.5,0,8,5">
diff --git a/source/VS2013Test/Views/MainView.xaml.cs b/source/VS2013Test/Views/MainView.xaml.cs
index aaa1696d..2cab040e 100644
--- a/source/VS2013Test/Views/MainView.xaml.cs
+++ b/source/VS2013Test/Views/MainView.xaml.cs
@@ -1,29 +1,19 @@
+using AvalonDock.VS2013Test.ViewModels;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace AvalonDock.VS2013Test.Views
 {
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
-    public partial class MainView : Window
+	/// <summary>
+	/// Interaction logic for MainWindow.xaml
+	/// </summary>
+	public partial class MainView : Window
     {
         public MainView()
         {
             InitializeComponent();
-        }
+			DataContext = Workspace.This;
+		}
 
 		private void MinimizeClick(object sender, RoutedEventArgs e)
 		{